ignore
Merge branch 'master' of https://github.com/betheluniversity/Tinker

Conflicts:
	.idea/misc.xml