Make build scripts folder
Merge branch 'master' of https://github.com/jboolean/webapp-skeleton

Conflicts:
	app.rb