Ignored GitIgnore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	src/com/github/Kaithyl/thaumvanilla/.gitignore