GITHUB test
Merge branch 'master' of
https://github.com/hailtondecastro/spring-net.git

Conflicts:
	test.txt