MAY CONFLICT
Merge branch 'GAE---Python' of https://github.com/RTakes/googleHoa into GAE---Python

Conflicts:
	functions.pyc
	hoabasicJSON.pyc