Testing merge conflicts
Merge branch 'master' of https://github.com/navinpai/OSMT2013.git

Conflicts:
	src/main/java/org/iiitb/os/os_proj/App.java
	target/maven-archiver/pom.properties
	target/surefire-reports/TEST-org.iiitb.os.os_proj.AppTest.xml
	target/surefire-reports/org.iiitb.os.os_proj.AppTest.txt
Merge branch 'master' of https://github.com/navinpai/OSMT2013.git

Conflicts:
	target/maven-archiver/pom.properties
	target/surefire-reports/TEST-org.iiitb.os.os_proj.AppTest.xml
	target/surefire-reports/org.iiitb.os.os_proj.AppTest.txt
Added /target to .gitignore