fixing shit
Adding user model with authentication
Merge branches 'production' and 'master'
testing?