commit
Merge branch 'master' of https://github.com/Christvictim/bajs

Conflicts:
	hej.txt