Release 0.1.1
Merge branch 'release/0.1.1'
0.2.0
Merge branch 'master' of github.com:wenzowski/derby-starter

Conflicts:
	package.json
Merge branch 'master' into develop