Mostly complete, will probably change some text boxes to selections instead
Mostly done, will probably change some text boxes to drop-down menus
Merge branch 'master' of https://github.com/bradjohns94/Team-Software-Project

Conflicts:
	EventData.java
	EventInterface.java