dev-sprint0 commit

I am just trying to submit my changes to dev-sprint0. One Piazza post mentioned pull request, so I am trying this. Hopefully I don't mess the original branch.