[#96] con @mariagomez OAuth Login
[#96] Fixed Conflicts