testing github
test file
another test
testing from github
Changed your test file
Merge branch 'Roselle-Branch' of https://github.com/Craig327/Inventory-Hombres into Roselle-Branch

Conflicts:
	Project/bin/classes/com/example/inventoryhombres/testRoselle.txt
Merge pull request #2 from Craig327/Roselle-Branch

Roselle branch
Merge pull request #3 from Craig327/Craig-branch

Craig branch
Merge branch 'master' into Craig-branch

Conflicts:
	Project/src/com/example/inventoryhombres/MainActivity.java