Commented out something that was giving me greif..
Merge branch 'master' of http://github.com/hibbards011/Events_App

Conflicts:
	Events_App/app/src/main/java/com/eventsproject/byuievents/MyEventsActivity.java
Merge branch 'master' of http://github.com/hibbards011/Events_App
Merge branch 'master' of http://github.com/hibbards011/Events_App
Merge branch 'master' of http://github.com/hibbards011/Events_App
Created EventOptionalInfo and EventRequiredInfo and reorganized the data of an event in these classes.