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