Files Changed
Merge branch 'master' of github.com:GDGCapeTown/relieflifemap

Conflicts:
	views/admin/events/list.html