working on making events registerable on events page
Merge branch 'chris2'