added initial slider to brewery page
Merge branch 'master' of github.com:calvinwchan/HoppyApp

Conflicts:
	css/stylesheet.css
	js/javascript.js
fixed toggle navigation on result.html
Merge branch 'master' of github.com:calvinwchan/HoppyApp

Conflicts:
	js/javascript.js