Fixing some events stuff.
Merge Conflict
Merging
Fixing Merge
Fixing email
Merge branch 'master' of github.com:kfreedland/CS169GAP
debugging
Fixing merge conflict
merge conflict
Merge branch 'master' of github.com:kfreedland/CS169GAP
Debugging
Merge branch 'master' of github.com:kfreedland/CS169GAP

Conflicts:
	public/js/core/models.js
merge conflicts