assets include modification
bcrypt fix
.gitignore modify
Merge pull request #2 from burduker/master

assets, bcrypt