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 ActionBar
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
View recipe and contact host page

Created view recipe page and ‘Contact Host’ page
bugfixes and general UI touchups
Update .gitignore

Added .idea ignore, sohuld be ignored as they interfere with compilation on different machines
Merge pull request #11 from mekarimizadeh/ActionBar

Everything looks good, merging View Event Component.
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