I think I'm doing this right

pulling the updated master into my repo