Merge branch 'kriti'

Conflicts:
	src/MainTest.java