Merge pull request #17 from MarkTonkinson/master

fixed login, except the error handling
auth changes
Merge pull request #18 from MarkTonkinson/master

stuffs updated for todo
Kory's Sweet Setup
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
changes
Merge pull request #19 from jpsiepert/master

Stuff- crazy stuff really in case we need to revert before this
fixed bugs in setup ctrl
banner fixes
Merge pull request #20 from jpsiepert/master

banner fixes