I don't know
yep

I don't know
Merge remote-tracking branch 'origin/master'

Conflicts:
	Beginning Java Lessons/src/Static.java