added index.css to main.css, added to gruntfile. not deleted the index.css
Merge pull request #14 from moog16/master

phonegap grunt, livereload on stylus and phonegap works
added main.css to .gitignore
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
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	gruntfile.js