some css changes
add grunt-cli to fix Travis errors
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp

Conflicts:
	app/assets/scss/main.scss
	build/css/main.css
	build/css/main.css.map
	build/index.html
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp
changed gruntfile.js
added backbone folder
merge conflicts
compacted to one test
sorry more cleanup
build changes?
wow
main.css merge conflicts resolved
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
removed server1 task
removed build folder
added index
include mongoose connect for the heroku mongodb
Incorporate heroku mongodb
change env port to 3000
remove local db from uristring