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.
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