test 2
Merge branch 'master' of https://github.com/joshblanchard/GitTestRepo

Conflicts:
	AnotherTestClassFile.java