My first commit
Merge branch 'master' of https://github.com/margareti/MyApp

Conflicts:
	README.md