merged changes manually
Merge branch 'assignments' of https://github.com/nickdotreid/runestone into nickdotreid-assignments
merged origin pip