Rebase branch 'T1'

Conflicts:
	src/R1.java
Factorial4 and ThreadDemo was added
"out" directory was added into ignore list