random commit before merge
Merge branch 'master' of github.com:tomy94/Blog
sets up register and password encryption