working on Input
Merge branch 'master' of git@github.com:loghina/GoogleChallenge.git

Conflicts:
	src/mainround/Input.java
	src/mainround/entities/Intersection.java