test
test
Conflicts:
	ANewFile.java
test checkin
Merge branch 'develop' of https://github.com/joshblanchard/GitTestRepo into awesome_team_branch

Conflicts:
	ANewFile.java
test