Fixed typo in '/IOSlogin'
Merge branch 'master' of https://github.com/SunJieMing/beer-finderWeb
Modified server code to handle recommendation request.
Modified server code to handle recommendation request.
Merge branch 'master' of https://github.com/SunJieMing/beer-finderWeb
Updated main page styling
Modified server code to handle recommendation request.
Updated main page styling
Merge branch 'master' of https://github.com/SunJieMing/beer-finderWeb
Modified server code to handle recommendation request.
Updated main page styling
Styled home page.
Merge branch 'master' of https://github.com/SunJieMing/beer-finderWeb

Conflicts:
	app/index.html
	app/styles/main.css
Merge pull request #107 from SunJieMing/master

Styling
fix merge conflict