hell is about to break loose
Merge branch 'master' of https://github.com/stirkac/FirstRepo

Conflicts:
	ja.txt