Merge pull request #10 from Yonet/master

Organized the css and styl files. added to the gruntfile
FB login partially integrated. May be a merge conflict in config file with Martins version, be careful when merging
Merge pull request #11 from eddyfh/master

FB login partially integrated. May be a merge conflict in config file wi...
improved map
Merge branch 'map' of https://github.com/meamstack/meetmeapp

* 'map' of https://github.com/meamstack/meetmeapp:
  added leaflet.styl file to gruntfile to compile into main.css, rearrange the styles files

Conflicts:
	www/css/leaflet.css
	www/css/leaflet.styl
	www/index.html
Merge pull request #12 from emailnitram/master

Simple map working with stylus in correct directory
adde 20px space to index.htmk for status bar on iphone
Merge pull request #13 from emailnitram/master

added space for status bar on iphone
gruntfile for phonegap and livereload on stylus works
Merge branch 'master' of https://github.com/meamstack/meetmeapp
added phonegap_grunt to .gitignore. unnecessary file to track
Merge pull request #14 from moog16/master

phonegap grunt, livereload on stylus and phonegap works
Merge branch 'master' of https://github.com/Yonet/meetMeApp into Yonet-master

* 'master' of https://github.com/Yonet/meetMeApp:
  added main.css to .gitignore
  added index.css to main.css, added to gruntfile. not deleted the index.css

Conflicts:
	www/styles/css/main.css
removed main.css
Merge branch 'master' of https://github.com/meamstack/meetmeapp

* 'master' of https://github.com/meamstack/meetmeapp:
  added phonegap_grunt to .gitignore. unnecessary file to track
  gruntfile for phonegap and livereload on stylus works
  FB login partially integrated. May be a merge conflict in config file with Martins version, be careful when merging

Conflicts:
	.gitignore
Merge pull request #18 from emailnitram/master

added status bar space
div for scroll not showing up