The marks are adjusted and for loop refactored.
Merge branch 'master' into ChangeDisplay

Conflicts:
	Data Proj/src/com/core/basic/Demo.java