ubuntu 10.04 LTS test conflicts5
Merge branch 'master' of https://github.com/ABC123ee/git_corp1.git

Conflicts:
	src/git_corp1/TestCorp.java