ignoring aux
Merge branch 'trunk' of https://github.com/math-classes/math-classes into trunk

Resolving conflicts:
	.gitignore
Now works with trunk