Merge pull request #27 from ewelaryba/master

Added Saved Items and my Account views
added random drink get and added alcohol tag to drink seeds
removed test/acceptance/casper-results.xml
test passing
Merge pull request #28 from tyleriguchi/master

added random drink get and added alcohol tag to drink seeds
Merge pull request #29 from ewelaryba/master

style and content changes in login, signup and savedItems
changed port to process.env
limit search to 3
Merge pull request #31 from tyleriguchi/master

changed port to process.env
Merge pull request #30 from ivanoats/master

removed test/acceptance/casper-results.xml
login / create fixed
added edit my account
check for valid email
added login validation
added error check for duplicates of new email edits
Merge pull request #32 from jeong-codefellows/master

new results view, edit accounts, & basic validation
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp

Conflicts:
	app/.DS_Store
	app/js/backbone/routers/Routes.js
	app/templates/savedItems.hbs
	app/templates/signup.hbs