>.<
Merge branch 'master' of https://github.com/osn64/rollingpin

Conflicts:
	config/bootstrap.js