resolving merge conflict
Merge branch 'master' of https://github.com/navinpai/OSMT2013.git

Conflicts:
	src/main/java/org/iiitb/os/os_proj/App.java