Merge branch 'master' of github.com:EJEHardenberg/coop-code

pulling again
added a sweet gradient and shit
Merge branch 'master' of github.com:scperkins/coop-code

Conflicts:
	index.html