some nice things
fixed automatically playing, and favicon
deleted gitignore
I made changes?
Merge branch 'master' of github.com:ilozinski/Vireo

Conflicts:
	composer.pyc
	static/vireo.js
	templates/index.html
Merge branch 'master' of github.com:ilozinski/Vireo

Conflicts:
	.gitignore
House cleaning. Got rid of Ian's index file. If we need it we can go look at the old commits
More house cleaning