.toc til gitignore
notes added to report stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/niive12/CupCollector