Cleaned the code a little and fixed sql error caused by merge
Merge branch 'master' of https://github.com/DragosBarbu/GamersLeague