Woof instead of meow (only 2 woofs)
Merge origin/master 2
Conflicts:
	src/testergit/TesterGit.java