Merge origin/master

Conflicts:
	beerPage.html
	beers.html
	breweries.html
	css/rateit.css
	index.html
	js/beers.js
	js/breweries.js
	js/common.js