merge conflict
Merge branch 'master' of https://github.com/lssieger1/casa-de-la-cultura
Sort is not keeping it specifically to past or future, working on it.Merge branch 'master' of https://github.com/lssieger1/casa-de-la-cultura

Conflicts:
	app/routes.php
	app/views/volunteer/attendance.blade.php
	app/views/volunteer/edit.blade.php
Merge branch 'master' of https://github.com/lssieger1/casa-de-la-cultura