Merge branch 'develop'
add "clear:both" to css
add <div class="clear"> to layout2.html
Merge branch 'develop'
css final updated (hopfully)
Merge branch 'master' into develop