Merge branch 'feature/ui' of C:\Users\Katherine\Documents\GitHub\codeflash with conflicts.
Merge remote-tracking branch 'origin/feature/ui' into feature/ui
Merge branch 'dev' into feature/ui
Update Problem's show view to look more like the mockups
Add a simple score calculating algorithm for Solutions
Start work on the compact Solution partial
Merge branch 'dev' into feature/ui

Conflicts:
	app/views/problems/show.html.erb
	app/views/solutions/index.html.erb
	app/views/solutions/show.html.erb
Merge branch 'dev' into feature/ui
Remove a link I accidentally added in a recent merge
Update the display of individual problems in the problem list
Make the problem list all awesome like it is in the mockups
Merge branch 'feature/ui' of https://github.com/codeflash/codeflash into feature/ui
Update Gemfile.lock
Merge branch 'dev' into feature/ui

Conflicts:
	Gemfile.lock
Fix some issues with rendering the solution partial
Fix problems#show view
Fix a floated line of HTML being in the wrong place
Link to solution pages from their compact counterparts
Added highlight.js
Merge branch 'feature/ui' of https://github.com/codeflash/codeflash into feature/ui

Conflicts:
	app/views/solutions/_compact.html.erb