Merge branch 'master' of https://github.com/mattsears/nyan-cat-formatter

Conflicts:
	lib/nyan_cat_formatter.rb
	lib/nyan_cat_music_formatter.rb
	nyan-cat-formatter.gemspec
	spec/nyan_cat_formatter_spec.rb