added cancel
added cancel
Merge branch 'master' of https://github.com/dilushan/Nerdc

Conflicts:
	NerdcProject/src/coded/frames/MainFrame.java