Merge pull request #749 from cbiesinger/patch-1

Fix flex-margin-no-collapse.html

Author: mrego

css-flexbox-1/flex-margin-no-collapse.html

@@ -22,6 +22,7 @@
 			width: 100px;
 			height: 100px;
 			background-color: green;
+			flex: none;
 		}
 
 		#box1 {
@@ -50,4 +51,4 @@
 		<div id="box2" class="box"></div>
 	</div>
 </body>
-</html>
+</html>