asdfasdf
asdf

Merge branch 'master' of https://github.com/GilbertWatson/CategoricalExam

Conflicts:
	.gitignore
as;ldkfj