Priority - STILL NEED CORNER CASE CHECK
Merge branch 'master' of https://github.com/tariqjav/inf1340_2014_asst2
UPDATED - STILL NEED CORNER CASE CHECK