I hope this isn't a conflict
Merge branch 'master' of https://github.com/mrwiseman/schoolproj

Conflicts:
	index.py