Test 0.3
test6
Merge branch 'master' of https://github.com/Pastatroll/Test

Conflicts:
	Test/test 2.txt