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

Conflicts:
	.gitignore