changed makefile to go in master
Merge branch 'master' of https://github.com/gobboph/website2

Conflicts:
	Makefile