first use of windows github
Merge branch 'master' of github.com:irimon/Sample_app

Conflicts:
	.gitignore