Merge branch 'master' of https://github.com/bukka-/test

Conflicts:
	test.txt
Merge branch 'master' of github.com:bukka-/test