Adding assignments
Merge with heroku edits