Hey Team Diversity
Merge pull request #1 from NicerHugs/master

changes favicon
Inital Commit
Merge branch 'JayWIlsonJr-master'
Merge branch 'master' of github.com:olliegill/Team-assignment
Merge branch 'ollie'

Conflicts:
	app/index.html
deletes the ul
Merge branch 'master' of https://github.com/olliegill/Team-assignment

Conflicts:
	app/index.html