a
Merge branch 'master' of https://github.com/poroiliev/testing.git

Conflicts:
	AllSortsOfTesting/src/nakov/Everything.java