hello
Merge branch 'master' of github.com:mrluxh/MyApp

Conflicts:
	README.txt