Merge branch 'master' of https://github.com/Basfius/sample_app

Conflicts:
	.gitignore