Alex's refactoring
Alex's refactoring 2
Alex's resolved conflict
Alex's last refactoring
Merge pull request #12 from cs27x/refactoring/alexander_wan/group1

Refactoring/alexander wan/group1
Looks good