changes by 2nd developer
Merge branch 'master' of https://github.com/kinkl/First-Git-Project

Conflicts:
	First Git Project/src/de/vogella/git/first/GitTest.java