update
Merge branch 'master' of github.com:threatstack/honeyfiles

Conflicts:
	views/login.handlebars