Initial commit
Merge branch 'master' of github.com:miguelgr/insitu-boilerplate

Conflicts:
	README.md