Added 'EVENT DEVIL' title to nav bar.
Merge branch 'master' of github.com:peggy-li/hackblue

Conflicts:
	war/jsp/home.jsp