added tests
Merge branch 'master' into homework
tests
Merge branch 'master' into homework
added tests
Merge branch 'master' into homework

Conflicts:
	app/controllers/problems_controller.rb
testing for controllers
Merge branch 'master' into homework
Merge pull request #10 from Noahhh/homework

Homework