merge confilg local
Merge branch 'futurelocal' of
https://github.com/tomaszgoralski/GitTrening.git into futurelocal

Conflicts:
	initcommit.txt