adding files
tests angular
Merge branch 'master' of https://github.com/moog16/meetMeApp

Conflicts:
	package.json
	test/karma.conf.js
	www/index.html
	www/js/controllers/map.js
	www/views/map.html
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/index.html
fixed look of create page
more styling of page, added logo, deviceready working
added check for no image added
Merge branch 'master' of https://github.com/meamstack/RadarApp into temp

* 'master' of https://github.com/meamstack/RadarApp:
  merged with everything
  location is not working
  pins drops once
  took out google default ui
moved time over create a page
everything is working. not icons
editting time on createactivity
Merge pull request #87 from eddyfh/master

Walkthrough and map page cleanup
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/js/controllers/createActivity.js
	www/js/index.js
	www/views/map.html
Merge pull request #88 from moog16/master

merged with Ed, create page is looking good
Merge branch 'master' of https://github.com/meamstack/RadarApp into temp

* 'master' of https://github.com/meamstack/RadarApp:
  editting time on createactivity
  Walkthrough cleanup and logo added on map page
  everything is working. not icons
  moved time over create a page
  Making the walkthrough more dope
  more styling of page, added logo, deviceready working
  fixed look of create page
  tests angular
  adding files

Conflicts:
	www/js/controllers/createActivity.js
playing with middle marker placement
Merge pull request #89 from eddyfh/master

Added time and date sliders and some styling for walkthrough
updated times
Merge branch 'master' of https://github.com/meamstack/RadarApp into temp

* 'master' of https://github.com/meamstack/RadarApp:
  Added time and date sliders and some styling for walkthrough
Merge branch 'master' of https://github.com/meamstack/meetmeapp