correct login and setup, I was kind of all over the place
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
Merge pull request #46 from MarkTonkinson/master

Fixed Login and Setup