NateW/obtvse — pull request #65 by cobychapple (2012-04-26 10:09:58+00:00)
Title: Merge outstanding conflicts in application_helper.rb

Looks like there was a conflict that didn't get resolved.