more vid stuff
Merge branch 'master' of github.com:kyle3mh/feetbeats

Conflicts:
	stylesheets/app.css