roll back
rb
Merge branch 'master' of https://github.com/TroyUyan/training-management-system

Conflicts:
	css/style.css