de nada
Merge branch 'master' into jon

Conflicts:
	rice/Ricedb.py
remove this
Sprint3
PPFAM jQuery page
Update .gitignore
Thumbs.db!!!
Merge remote-tracking branch 'origin/master' into jon
App.yaml Jon