encapsuklated
differnt comment
Merge branch 'encapsulated'

Conflicts:
	src/gittest/Main.java