merge conflict resolution
completed leaderboard logic and associated user, user_controller, and challenge methods
fixed bug so big board check win function wins
fixed merge conflicts with ttf and development branch merge - functionality for app works
fixed merge conflicts with ttf and development branch merge - functionality for app works