Revert "Merge remote-tracking branch 'origin/master'"
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit c2a2642a785628e03e638b3fc6b2d0aa9674694c, reversing
changes made to 3ff0705252a1561822b6e2c785ff6d108ea0fd06.

cs2103aug2015-t16-1j/fini,cs2103aug2015-t16-1j/fini