testing
Merge branch 'master' of github.com:jassicacanidy/CallistoReinvented
users controller fixing
Merge branch 'master' of github.com:jassicacanidy/CallistoReinvented