Good news everybody! I broke everything again...
Merge branch 'master' of https://github.com/jackhenderson101/Project-Prometheus

Conflicts:
	administration/index.php
	calender2.php
	class_details.php
	class_lists.php
	css/main.css
	includes/footer.inc.php
	includes/header.inc.php
	my_classes.php