Caitlin

Remade User model, minor changes to postcontroller