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...
Merge pull request #12 from emailnitram/master

Simple map working with stylus in correct directory
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/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