commit
Merge branch 'master' of https://github.com/zemar/USApp

Conflicts:
	.gitignore