Tweaked file structure.
Merge pull request #15 from myclamm/master

Database is filled with Beer now - Documented neo4j database set-up and brewDB querying
Rebased from upstream master
Comment out the invocation of dumpBeersIntoBD
Merge pull request #16 from liubolightning/feat/database

Refactored server side code
Tweaked file structure.
Completed basic storyboard.
Commit changes
Merge branch 'master' of https://github.com/SunJieMing/beer-finder

Conflicts:
	beer-advisor.xcodeproj/project.xcworkspace/xcuserdata/Ben.xcuserdatad/UserInterfaceState.xcuserstate
	beer-advisor/Base.lproj/Main.storyboard
Tweaked file structure.
Completed basic storyboard.
Commit changes
Fixed merge conflicts.
Merge branch 'master' of https://github.com/SunJieMing/beer-finder

Conflicts:
	beer-advisor.xcodeproj/project.xcworkspace/xcuserdata/Ben.xcuserdatad/UserInterfaceState.xcuserstate
	beer-advisor/Base.lproj/Main.storyboard
Fixed issues created by last rebase
Merge pull request #17 from SunJieMing/master

Updated storyboard
add routes.js, adjust server, add starter data for questionnaire, learned how to spell questionnaire
Merge pull request #18 from lpappone/master

add routes.js, adjust server, add starter data for questionnaire, learne...
Linked buttons, image, and slider with first view controller.
Pre-HTTP setup commit