what up!!
Merge branch 'master' of https://github.com/riki-y/Rikis-WorkSpace

Conflicts:
	test.txt