Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp into HEAD
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp into HEAD
added login verification
recommit for travis build
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
commented out unnecessary questions post routes
style changes
Merge pull request #21 from ionox0/master

Added dynamic random question functionality. Fixed back/fwd saving of questions.
Merge pull request #23 from tyleriguchi/master

style changes
added more questions
fixed signup view
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
Merge pull request #24 from tyleriguchi/master

added more questions
Merge pull request #25 from ewelaryba/master

hooked up signup view
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
deleted the CORS file that I added... probably won't be needed actually