users and sessions are almost full up and running
views aren't quite working with layout, almost there
fixed merge stuff
all working, retooled the controllers
removed admin_status from strong params, created travis.yml