Triangle, Image, YouTube working.
Merge done.
Merge branch 'master' of github.com:prezi/a2p

Conflicts:
	example_prezi.py