Setting up GitModules (1)
SubModule
Merge branch 'master' of https://github.com/Atex/AtexRepo

Conflicts:
	.gitmodules