#cleanup
test rendering to different formats
Merge branch 'refs/heads/ars'

* refs/heads/ars:
  test rendering to different formats
  #cleanup

Conflicts:
	app.js