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
Updated progress model associations
Added checkpoint method to redirect to last visited concept
wip progress javascript
Merge branch 'master' into chris

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