Still ignoring silly changes in the submodule..

Conflicts:
	.gitmodules