head no longer broken
indent
Forgot password flow
Merge branch 'master' of github.com:Strider-CD/strider
Add strider-dockerfile
duplicate license
update readme
Merge branch 'master' into 1_4_refactor

Conflicts:
	lib/models.js
	package.json
	routes/index.js
Merge branch '1_4_refactor' of github.com:Strider-CD/strider into 1_4_refactor