Added Goats!
Merge branch 'master' of https://github.com/dangerdan/JavaTest

Conflicts:
	bin/DemoProject/Program.class
	src/DemoProject/Program.java