Merge pull request #16 from Noahhh/homework

Homework
trying to let user choose when problem is solved
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/problems_controller.rb
trying to let users choose when problem is solved
Merge pull request #17 from ToreyStapleton/master

trying to let user choose when problem is solved
Merge branch 'master' of https://github.com/Noahhh/homeworkhelp
Merge branch 'master' into homework