Added auth to app
User auth
User Auth
Updated merge conflicts
Merge pull request #8 from csrobinson86/master

Added User Auth
fixed merge conflicts