pushing before pulling
Merge branch 'master' of https://github.com/korysumsion/forever-planned
state changes
routes protected
merge fixes
conflict fixes
login ctrl fixes
Merge pull request #41 from jpsiepert/master

Auth Fixes