.
Merge branch 'master' of https://github.com/niaquinto/Warren

Conflicts:
	index.html
	style.css