c
Merge remote-tracking branch 'origin/master'

Conflicts:
	TAPtoBUY3/src/com/gui/taptobuy/datatask/Main.java