Up Home
Merge branch 'master' of https://github.com/andredangelo/the-framework-2

Conflicts:
	css/styles.css