I did what I knew how to do, didn't quite understand what the rest
meant, will figure out later
Merge remote-tracking branch 'origin/master'

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