blank
merged from master
Merge pull request #15 from ToreyStapleton/master

minor fixes, added pagination
mailer mostly working
Merge branch 'master' into homework
pushing to master
Merge pull request #16 from Noahhh/homework

Homework
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/problems_controller.rb