working on user authentication
Merge branch 'master' into klead3r
Merge pull request #4 from cancerballs/klead3r

Klead3r