ss
Merge branch 'master' of https://github.com/annyfan/Samples.git

Conflicts:
	pythongae/app.yaml
	pythongae/guestbook.py
	pythongae/index.html
	pythongae/index.yaml
	pythongae/stylesheets/main.css
hh