Updatefor CS1010S
Merge pull request #6 from emman27/master

Update for CS1010S AY 14/15 Sem 1