adding files
tests angular
took out google default ui
pins drops once
merging
merged with the latest
location is not working
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
merged with Martin's
fixed look of create page
more styling of page, added logo, deviceready working
merged with everything
Merge pull request #86 from Yonet/master

Merged with everyones. Latest map
Making the walkthrough more dope
Merge branch 'master' of https://github.com/meamstack/RadarApp
moved time over create a page
everything is working. not icons
Walkthrough cleanup and logo added on map page
editting time on createactivity