My refactoring branch
Merge pull request #6 from cs27x/refactoring/alex_meyer/group0

My refactoring branch