BIG UPDATE

BABY COME WITH ME AND BE MY OOH LA LA
Merge branch 'master' of https://github.com/cs2103aug2014-t11-1j/main into krystal
Merge branch 'krystal' of https://github.com/cs2103aug2014-t11-1j/main into krystal