deploy
deploy
fix for chrome
fix
Merge branch 'master' of heroku.com:salty-citadel-2245

Conflicts:
	.idea/workspace.xml
	testsite/wsgi.pyc
minor fixes
minor fixes