Horns on the bear
Merge branch 'master' of https://github.com/andyhullinger/WEB301-class-project-for-Fall14

Conflicts:
	README.md