Working on trans 2
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/src/com/example/payback/User.java