changes to entities
Merge branch 'master' of https://github.com/loghina/GoogleChallenge

Conflicts:
	src/mainround/entities/Problem.java