resolved merge conflicts
Merge pull request #18 from cs27x/refactoring/MingYang_Lu/group1

refactoring/MingYang_Lu/group1
Alex's resolved conflict