trying to mask as php
Merge branch 'master' of github.com:calvinwchan/HoppyApp
Merge branch 'master' of github.com:calvinwchan/HoppyApp
Merge branch 'master' of github.com:calvinwchan/HoppyApp
Merge branch 'master' of github.com:calvinwchan/HoppyApp

Conflicts:
	css/brewery.css
Merge branch 'master' of github.com:calvinwchan/HoppyApp

Conflicts:
	greenflash.html
	karlstrauss.html
	stone.html