testowy commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Profiler.java
testowy commit