div for scroll not showing up
Merge branch 'master' of https://github.com/meamstack/meetmeapp
took out leaflet.css from index.html and added to gruntfile to be compiled into main.css
added boilerplate.css
reorganized the libraries, added google map instead of leaflet
Merge branch 'master' of https://github.com/Yonet/meetMeApp into Yonet-master

* 'master' of https://github.com/Yonet/meetMeApp:
  reorganized the libraries, added google map instead of leaflet
  added boilerplate.css
  took out leaflet.css from index.html and added to gruntfile to be compiled into main.css
  div for scroll not showing up

Conflicts:
	gruntfile.js
	www/index.html
	www/js/controllers/map.js
	www/styles/stylus/leaflet.styl
	www/views/map.html
removed merge conflict from gruntfile
changed mapCanvas to z-index 0
Merge pull request #25 from emailnitram/master

fixed merge conflicts from Yonet's pull request :)
added cordova-2.7.0 again
cleaned up git hist
removed leaflet from app
Merge branch 'master' of https://github.com/meamstack/meetmeapp

* 'master' of https://github.com/meamstack/meetmeapp:
  WIP for fb login redirect
Merge pull request #26 from emailnitram/master

removed leaflet
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/index.html
	www/js/app.js