A
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main

Conflicts:
	src/edu/dynamic/dynamiz/UI/DisplayFormatter.java