add moment.js
Merge branch 'master' of github.com:compsoc-edinburgh/website-django
remove moment from requirements
Revert removal of Events model.

Reverts a6341dea50b92babd77ce03ef67df1280cdcb35b.
worked on setting dates of events
Merge branch 'master' of github.com:compsoc-edinburgh/website-django
Merge branch 'ilwhack'

Conflicts:
	requirements.txt
Make bio optional
Fix requirements