iframe tomfoolery
Merge branch 'master' of https://github.com/jeffplourde/openice

Conflicts:
	demo.html