1. ignore Gemfile.lock before pull
Merge branch 'master' of github.com:Silenthillnight/cs169
1. Fix registration with waitlist_max = 0
Merge branch 'master' of github.com:Silenthillnight/cs169