oyo
Merge branch 'master' of https://github.com/muff1225/muffup9

Conflicts:
	app/assets/javascripts/app002.js.coffee
	app/views/app002/test.html.erb