updata using memcache
Merge branch 'master' of github.com:jayco/Python-app-engine-data-visualisation

Conflicts:
	list_of_thrones/listofthrones.pyc
	list_of_thrones/model/models.pyc