Merge branch 'master' into feature/ace
Merge branch 'dev' into feature/ace
Merge branch 'dev' into feature/ui
Merge branch 'dev' into feature/ace
Added the ability to go to /profiles/username/edit to edit profile
Update permissions and give users full read access when they're not logged in
Move "New Solution" link from solutions/index to problems/show
Embedded ACE editor into new solutions page.
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
Fixed ALLLL the solution problems.
Typo fix
Merge of feature/ace into dev
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev
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