change in Logic
Merge branch 'master' of
https://github.com/cs2103aug2014-t16-2j/main.git

Conflicts:
	FlexiPlanner/src/Logic/Logic.java