bumped version and fixed conflic
Merge branch 'master' of https://github.com/colynb/generator-go-static

Conflicts:
	post/index.js