smth
Merge branch 'rails_app' of https://github.com/MrBadge/YTZ into rails_app

Conflicts:
	app/assets/javascripts/ytz1_usage.js