Now I'm going up to the API for help
Merge branch 'master' of github.com:initr/initr

Conflicts:
	lib/initr.js