tweeks & bug fixes
Merge branch 'master' of github.com:GoogleDH/Contra

Conflicts:
	web/contra.dart