ca
Merge branch 'branch-c-a'

Conflicts:
	hellogit/src/main/java/au/com/retailinsight/hellogit/App.java