Merge pull request #22 from OSN64/nig-devs

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

Conflicts:
	config/bootstrap.js
.
Merge branch 'master' of https://github.com/OSN64/rollingpin into nig-devs
nan