3
Merge branch 'master' of https://github.com/Anjimo/jam_proj

Conflicts:
	tester.txt