It told me to commit this
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git practice #2/src/com/bayviewglen/gitpractice/BagWithReciepts.java