attempted a syntax fix of the carousel
Merge branch 'master' of https://github.com/WyncodeCo/prework
second attempt at commenting out current user calls.
Merge branch 'diego'

Conflicts:
	app/models/user.rb
removed accidently code
Merge branch 'master' of github.com:WyncodeCo/prework

Conflicts:
	app/models/user.rb
Merging master
changed the nav bar
concept spying
Conflicts:
	app/views/units/show.html.slim
added fake number updating
Added more to the progress model and styling
commented out unused variables in coffescript
Merge branch 'master' into chris

Conflicts:
	app/assets/javascripts/units.js.coffee
	app/views/units/show.html.slim
Changed progress creating method
Merge branch 'master' of github.com:WyncodeCo/prework
added comments to coffee
Merge branch 'master' into chris
Added admin control page
Finished student create form, testing mailer