sycing with laptop
Merge branch 'wchamilton_CreateEvent' of github.com:wchamilton/Event-Fly into wchamilton_CreateEvent

Conflicts:
	EventFly/app/src/main/java/bth740/eventfly/Create/EnterFieldsActivity.java