removed file that shouldnt be tracked
Merge branch 'master' of github-alanuk:stevepetebruce/SchoolBook

merge commit
update quiz and timeline