game logic updates incomplete
merge conflict resolution
completed leaderboard logic and associated user, user_controller, and challenge methods