main function added
Merge branch 'master' into kriti

Conflicts:
	src/MainTest.java