probably some deleted lines that git likes to tell me were changes
added data to db seed
added data to db seeds correctly this time
Changed recipe tags to reflect answer tags
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp

Conflicts:
	app/templates/firstQuestion.hbs
	app/templates/index.hbs
	db/seeds/drinks.json
	db/seeds/firstQuestion.json
	db/seeds/secondQuestion.json
Merge pull request #8 from ewelaryba/master

added some data to db seeds
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp