first
Merge branch 'master' of https://github.com/Trung-JCed/Social-Computing

Conflicts:
	Main.java
Merge branch 'master' of https://github.com/Trung-JCed/Social-Computing
thread