Merge branch 'kriti' of https://github.com/kirtigrkist/testrepo into kirti

Conflicts:
	src/MainTest.java
added test class
Merge branch 'master' of https://github.com/kirtigrkist/testrepo

Conflicts:
	src/MainTest.java