Merge branch 'kriti'

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

Conflicts:
	src/MainTest.java
fifth line added
Delete MainTest.class
Merge branch 'master' of https://github.com/kirtigrkist/testrepo into kirti
added 6th line