Clean up bad commit >.<
Merge branch 'master' of https://github.com/blackening/cs3216-dest