new
newone
Merge branch 'master' of https://github.com/isspek/CENG316.git

Conflicts:
	CENG316/src/sugar_evaluation/mvc/controller/Icontroller.java
Merge branch 'master' of https://github.com/isspek/CENG316.git