merging to hmt-brandeis-user

not sure why this isn't done automatically when you push and pull but whatever