Testing eclipse set up
Merge branch 'master' of https://github.com/jwtrueb/com.apcs.tigerview

Conflicts:
	.gitignore