commit
Merge branch 'master' of https://github.com/ashisjena/GuideToGalaxy.git

Conflicts:
	src/main/java/com/thoughtworks/codingchallenge/reader/InputReader.java
	src/test/java/com/thoughtworks/codingchallenge/converter/ConverterTest.java
	src/test/java/com/thoughtworks/codingchallenge/reader/InputReaderTest.java
	src/test/java/com/thoughtworks/codingchallenge/validator/ValidatorTest.java