added zip to sign up page
put form and table on event new page
fixed user.rb merge conflict
removed some more merge conflict ish