login and register page commited
Merge branch 'master' into charlie-pc
Merge branch 'charlie-pc'
Merge branch 'master' of https://github.com/CharlieFaceButt/lesson-kill