Merge pull request #6 from fiery-skippers-2014/user_login_stuff

User login stuff
Merge branch 'master' into user_login_stuff
merged with local master, no conflicts