I am NOT Adam!!
Merge branch 'master' of https://github.com/adambrill/amy

Conflicts:
	home.html