button
Merge branch 'master' of https://github.com/minghorn/NPGoProj

Conflicts:
	npgo.html
deleted template