Initial commit
Initial commit
Merge branch 'master' of https://github.com/tinjaw/uspaim into develop

Conflicts:
	.gitignore