gitignore change
.gitignore is now working
Revert "gitignore change"

This reverts commit ead8bd766d49d72b7f21a1161053c6c88ae4e517.
Added css to base
Added CSS back in
Recompilation of main.min.css
add alert for appointments occuring with 1 hour
bug fix in time comparison
Added resend booking email confirmation option within Admin chase
Merge
Show last note when chasing the appointment
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	application/views/digital/T_adminChase.php
Fixed issues from note showing from last appointment
Added Booked menu

Shows appointments booked by the User
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	assets/css/digital/main.min.css
Added filters to Booked Menu on Admin
.gitignore is now working
.gitignore is now working
Gitignore working