para resolver conflito
commit 23
Merge remote-tracking branch 'origin/master'

Conflicts:
	Appengine/src/com/example/myproject/Staged.java