first commit
Merge branch 'master' of https://github.com/krystyna-bury/testapp

Conflicts:
	.gitignore