Same shit

Adding Eric Stuff
Merge branch 'master' of https://github.com/dbloch32/darkteam

Conflicts:
	Team Website/css/app.css