reorganized code
Merge branch 'master' of https://github.com/theanh0512/Ngoc_FYP

Conflicts:
	src/mainPackage/ContentDownloader.java
	src/mainPackage/GUI.java