deleting classpath. please copy your classpath and save it somewhere
Merge branch 'master' of https://github.com/kailashnagarkoti/JavatunesP-portlet

Conflicts:
	.classpath