merge coflict, again
merge coflict, again
Merge branch 'master' of https://github.com/ChristianJGarrido/thejuke
User is now logged in when they register