Updated everything

Think I broke the bird bounce thing though between leaving hte office
and recommitting
Merge branch 'master' of https://github.com/willdawson/songbird

Conflicts:
	app.js
	index.html