merge conflict resolution
completed leaderboard logic and associated user, user_controller, and challenge methods
updated readme and challenges JS
created a nav bar and worked on css
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
Player Color CSS updates
added leaderboard
fixed nav
Resolve merge conflicts
added nav bar
edge case for D partially fixed
fixed merge conflicts
CSS updates
Merge branch 'development' of github.com:ilanaseid/games-app into development
added leaderboard
merge
CSS update
Merge branch 'development' of github.com:ilanaseid/games-app into development