"Depot Scaffold"
Merge branch 'master' of github.com:arinto/depot-ror-project

Resolved conflicts:
	.gitignore