*ignore*
Merge branch 'master' of https://github.com/cs2103aug2014-t15-1j/main.git
fixed bug#2