add
Merge branch 'master' of https://github.com/twinstony/goumin

Conflicts:
	app/cc.jade