fixed questions for the third time
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
style changes and some handlebar reorganizing
got rid of humans.txt and drink image
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp

Conflicts:
	app/index.html
	app/js/backbone/routers/Routes.js
	app/js/backbone/views/IndexView.js
	app/templates/index.hbs
	test/drinks_json_api_test.js
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
added back a indexView.js to routes
changed vodka to champagne in drinks test to make it pass
Your branch is up-to-date with 'origin/master'.
Merge pull request #11 from ewelaryba/master

The beginnings of a more stylish app