Parse Test object success
Successfully requesting parse api but not signup
Event object attributes saving
User and events being pushed to back end

Added new pages for menu and event locator. need to link back end and
front end
Passing inputs for signup to backend successfully
Joined login and signup page
Log in
new build
Logo added
Merge branch 'master' into parse

Conflicts:
	coloradoconcerts/platforms/amazon-fireos/assets/www/index.html
	coloradoconcerts/platforms/android/CordovaLib/ant-build/build.prop

coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug-unal
igned.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_.d
	coloradoconcerts/platforms/android/ant-build/build.prop
	coloradoconcerts/platforms/android/ant-build/classes.dex
	coloradoconcerts/platforms/android/ant-build/classes.dex.d
	coloradoconcerts/platforms/android/ant-gen/R.java.d
	coloradoconcerts/platforms/android/assets/www/index.html
	coloradoconcerts/platforms/blackberry10/www/index.html
	coloradoconcerts/platforms/firefoxos/www/index.html
	coloradoconcerts/platforms/ios/www/index.html
New Build for new machine
Logo showing

Need to fix user.js
Fixed user.js signup and login
Some deletions

Removed non working google maps script from head. Ready for google maps
work
Added google maps plug in

Map not displaying yet
Create Events page added

successfully creating event from user input
Event master page completed

successful query of events
Added buttons and logout
Merge branch 'parse'

Conflicts:
	coloradoconcerts/platforms/amazon-fireos/assets/www/cordova_plugins.js
	coloradoconcerts/platforms/amazon-fireos/assets/www/index.html
	coloradoconcerts/platforms/android/AndroidManifest.xml
	coloradoconcerts/platforms/android/CordovaLib/ant-build/build.prop

coloradoconcerts/platforms/android/ant-build/AndroidManifest.cordova.xml

coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug-unal
igned.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_.d
	coloradoconcerts/platforms/android/ant-build/build.prop
	coloradoconcerts/platforms/android/ant-build/classes.dex
	coloradoconcerts/platforms/android/ant-build/classes.dex.d
	coloradoconcerts/platforms/android/assets/www/cordova_plugins.js
	coloradoconcerts/platforms/android/assets/www/eventlocator.html
	coloradoconcerts/platforms/android/assets/www/index.html
	coloradoconcerts/platforms/android/assets/www/js/user.js
	coloradoconcerts/platforms/android/assets/www/menu.html
	coloradoconcerts/platforms/android/res/xml/config.xml
	coloradoconcerts/platforms/blackberry10/www/cordova_plugins.js
	coloradoconcerts/platforms/blackberry10/www/index.html
	coloradoconcerts/platforms/firefoxos/www/cordova_plugins.js

coloradoconcerts/platforms/ios/Colorado-Concerts.xcodeproj/project.pbxpr
oj
	coloradoconcerts/platforms/ios/Colorado-Concerts/config.xml
	coloradoconcerts/platforms/ios/www/cordova_plugins.js
	coloradoconcerts/platforms/ios/www/css/app.css
	coloradoconcerts/platforms/ios/www/eventlocator.html
	coloradoconcerts/platforms/ios/www/index.html
	coloradoconcerts/platforms/ios/www/js/user.js
	coloradoconcerts/platforms/ios/www/menu.html
	coloradoconcerts/plugins/amazon-fireos.json
	coloradoconcerts/plugins/android.json
	coloradoconcerts/plugins/blackberry10.json
	coloradoconcerts/plugins/firefoxos.json
	coloradoconcerts/plugins/ios.json
	coloradoconcerts/www/eventlocator.html
	coloradoconcerts/www/index.html
	coloradoconcerts/www/js/user.js
	coloradoconcerts/www/menu.html