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

Conflicts:
	a/c/main.css
	homepage.html
	index.html
my first
Merge branch 'master' of https://github.com/amosdesigns/code3

Conflicts:
	a/c/main.css
	a/i/logo.png
	homepage.html
	index.html
Revert "Merge branch 'master' of https://github.com/amosdesigns/code3"

This reverts commit 8a0506746809e10aa961898a857212f919860951, reversing
changes made to e8b784ed59a1aeded2d461b14ed5d94e21cd24c3.

Conflicts:
	a/c/main.css
	homepage.html
	index.html
Revert 8a05067..e9558f2

This rolls back to commit 8a0506746809e10aa961898a857212f919860951.
Merge branch 'master' into adda
Revert ce64da4..fd4c31b

This rolls back to commit ce64da4b63e3195089cfff19c4c5e30fb14f78c5.
Revert "Homework"

This reverts commit ce64da4b63e3195089cfff19c4c5e30fb14f78c5.
Revert e8b784e..87d4794

This rolls back to commit e8b784ed59a1aeded2d461b14ed5d94e21cd24c3.
Merge branch 'adda' of https://github.com/amosdesigns/code3 into adda