added test file
test mod
another commit
test
test checkin
Merge branch 'develop' of https://github.com/joshblanchard/GitTestRepo into awesome_team_branch

Conflicts:
	ANewFile.java
test
Squashed commit of the following:

commit dfe12e2d18159ebe96b49edd41b5999812f69659
Author: joshblanchard <josh.blanchard@infernored.com>
Date:   Fri Feb 21 13:43:27 2014 -0500

    test changes
Squashed commit of the following:

commit 64ea9c6080a638bee6bbb75a439a13923795c3ec
Author: joshblanchard <josh.blanchard@infernored.com>
Date:   Mon Feb 24 13:53:39 2014 -0500

    test

commit dfe12e2d18159ebe96b49edd41b5999812f69659
Author: joshblanchard <josh.blanchard@infernored.com>
Date:   Fri Feb 21 13:43:27 2014 -0500

    test changes