concept spying
Merge branch 'master' into chris

Conflicts:
	app/assets/javascripts/units.js.coffee
	app/views/units/show.html.slim
added comments to coffee
Merge branch 'master' into chris
wip progress javascript
Merge branch 'master' into chris

Conflicts:
	app/models/progress.rb
	app/models/user.rb