Cleaning Everything Up
Cleaning up .ignore files
Merge branch 'master' of https://github.com/ajpahl1008/megaevent

Conflicts:
	megaevent-services/.idea/misc.xml
	megaevent-services/.idea/workspace.xml
	megaevent-services/megaevent-services.iml