?
Merge branch 'master' of https://github.com/stevwayne/ISST-Android

Conflicts:
	.gitignore