Layout
Merge branch 'master' of git@github.com:rabede/webeng2013.git

Conflicts:
	css/style.css
	index.html