1.init
1.edit gitignore
Merge branch 'master' of https://github.com/teze/MyApplicationProject

Conflicts:
	.gitignore
	README.md