misc.xml and vcs.xml have changes
Merge branch 'master' of https://github.com/hibbards011/Events_App

Conflicts:
	BYUIEvents/.idea/misc.xml
	BYUIEvents/.idea/vcs.xml
Trying to Get everything working...