Merge pull request #19 from BlakeJenningsJohnson/waitlist2

Waitlist2
admin bug
bug fixes
merge conflict in application.html.erb