login page
Merge branch 'master' of https://github.com/JeffriesAgile/comp61542-2014-lab
refactor