Part 5 start
Merge remote-tracking branch 'origin/master'

Conflicts:
	Part5/src/SimpleConstructor2.java
Part 5 start c2