my first
Merge branch 'master' of https://github.com/amosdesigns/code3

Conflicts:
	a/c/main.css
	a/i/logo.png
	homepage.html
	index.html