account for Gruntfile rename in grunt tasks
add logo and some badges to README
update quick install
move license into separate file
ignoring huge chunks of files from other branches
Merge remote-tracking branch 'upstream/master' into upstream

* upstream/master:
  move license into separate file
  update quick install
  add logo and some badges to README
  account for Gruntfile rename in grunt tasks
Merge branch 'upstream'

* upstream:
  ignoring huge chunks of files from other branches
  move license into separate file
  update quick install
  add logo and some badges to README
  account for Gruntfile rename in grunt tasks

Conflicts:
	Gruntfile.js
Merge branch 'develop'

* develop:
  Added what this is
  merged with latest everything

Conflicts:
	README.md
Fixes for Heroku deployment.
Forgot to move load-grunt-tasks into dependencies.
post
Merge branch 'heroku' of https://github.com/adrianedworthy/mean into adrianedworthy-heroku
heroku test
fixed env changes, added some authors
needs bootstrap to run without changes
Merge branch 'master' of https://github.com/linnovate/mean into upstream

* 'master' of https://github.com/linnovate/mean:
  fixed env changes, added some authors
  heroku test
  post
  Forgot to move load-grunt-tasks into dependencies.
  Fixes for Heroku deployment.
Merge branch 'upstream'

* upstream:
  fixed env changes, added some authors
  heroku test
  post
  Forgot to move load-grunt-tasks into dependencies.
  Fixes for Heroku deployment.

Conflicts:
	package.json