ewqew

adad
Merge remote-tracking branch 'origin/master'

Conflicts:
	Part 1 and 2/Manual.java
Latest part2

part2