something to conflict with
little comment
test mr
Merge branch 'test' of https://github.com/bmchild/gitmodules-model into test

Conflicts:
	gitmodules-data/src/main/java/com/bmchild/service/AwesomeServiceImpl.java