added comments
fixed merge
added server testing in spec folder
Merge pull request #27 from myclamm/master

Added Mocha Testing for server in spec folder
Merge pull request #20 from lpappone/master

fix server data, change slider to five piece rating button
set up backend part of authentication with passport
set up backend part of authentication with passport
fix merge conflict
Merge pull request #29 from lpappone/authnew

set up backend part of authentication with passport
Merge pull request #30 from BeerWithMe/staging

Staging
Tests are linked up and basic tests are passing.
Add an endpoint at server side to serve up information about a particular beer
Tests are linked up and basic tests are passing.
Impletemented basic test to check for cycleImages functionality.
Merge branch 'master' of https://github.com/SunJieMing/beer-finder

Conflicts:
	beer-advisor.xcodeproj/project.xcworkspace/xcuserdata/Ben.xcuserdatad/UserInterfaceState.xcuserstate
	beer-advisorTests/beer_advisorTests.swift
Merge pull request #31 from SunJieMing/master

Testing
Merge pull request #32 from liubolightning/master

Add an endpoint at server side to serve up information about a particular beer.
Merge pull request #33 from BeerWithMe/staging

Staging
fix merge conflicts