modified:   scaffold
Merge branch 'master' of https://github.com/gashouse/gasscaffold

Conflicts:
	.gitignore

	modified:   .gitignore