purple
Merge branch 'master' of https://github.com/bstory32/Project_Loud

Conflicts:
	css/main.css