Test views - login page
test only one file
test commiting via GitHub
resolve conflict files
Merge branch 'master' of https://github.com/phamonyut/hoorayjob