Added User controller, authentication method for user, home, login, and new_user views. Ignore the error page.
Unfucked controller.
resolving merge conflicts
Merge branch 'mkirlin'