finished boilerplate
Merge branch 'initial-boilerplate' into develop