some stuff idk
trying hard to resolve conflicts
prettify and de-break it
nice stuff
Merge pull request #2 from cmliotta/authentication_and_controllers

Authentication and controllers