merge
merge
fix middleware use commands in server.js, simplify serialize and deserialize User functions; auth/facebook working
merge users.js route