too lazy to commit msg
Merge branch 'master' of github.com:brycedorn/chirpymood

Conflicts:
	public/javascripts/birds.rb
once again, it is too early in the morning to have commit messages