Updating the master branch

Now it is consistent with where we finished in club on 10/2