bug fixes
merge conflict in application.html.erb
removed remenant of a forgotten time
Merge pull request #20 from BlakeJenningsJohnson/waitlist2

Waitlist2