Completed XML for first page of CreateEvent wizard. TO-DO: java portion (forward button and date/time pickers)
finished basic field imput, finishing image selection view
added changing blue background to selected image - want to change to foreground
Finished off border of selected image. Moving to Misc data
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
finished page 3 of CreateEvent wizard
Completed Event Creation Wizard
bugfixes and general UI touchups
Merge branch 'master' into merger

Conflicts:
	EventFly/.idea/misc.xml
	EventFly/app/app.iml
	EventFly/app/src/main/AndroidManifest.xml
	EventFly/app/src/main/java/bth740/eventfly/MainActivity.java
	EventFly/app/src/main/res/layout/activity_main.xml
	EventFly/app/src/main/res/values/strings.xml
merging
merged marie's and my code. checking if remote has anything to merge, else pushing for review
syncing to desktop to fix problems
trying to get it to compile on desktop, syncing with laptop
Merge branch 'wchamilton_CreateEvent' of github.com:wchamilton/Event-Fly into wchamilton_CreateEvent
converting app to fragments
converting app to fragments
finished augmenting the create event wizard to use fragments. TO-DO: Port Marie's code to fragments and write up instructions for fragments
Finalized porting from activities to fragments with single main activity navigation is also implemented through the drawer
Merge pull request #16 from wchamilton/fragmentAugmentation

Fragment augmentation