Merge branch 'master' of https://github.com/AdamMc331/CheckIt

Conflicts:
	.gitignore