Blah
Merge branch 'master' of https://github.com/jgpereira23/NJITSHPE

Conflicts:
	Scripts/displayEvents.php