mute button and change of text button
Merge branch 'master' of https://github.com/tomjudd1/santa

Conflicts:
	source/javascripts/application.js