6/3
Merge branch 'master' of https://github.com/nategot/Project

Conflicts:
	Project/Styles/joinEvent.css
	Project/joinEvent.aspx