swapped cols, removed end, added tasks
changed cols
Merge branch 'master' of https://github.com/cs2103aug2014-t15-1j/main

Conflicts:
	data_tasks.txt