Catered for "C" for completed and "R" instead of "F" for floating
Merge branch 'master' of https://github.com/cs2103aug2014-w14-1j/main into daryl-ui