commetting 3 files
Merge branch 'MultiLangugeSupport' of https://github.com/ModinifyTechnologies/ModinifyWebSite.git into MultiLangugeSupport
commiting with errors
Fixing repo....
new patch...
Merge branch 'MultiLangugeSupport' of
https://github.com/ModinifyTechnologies/ModinifyWebSite.git into
MultiLangugeSupport

Conflicts:
	ModinifyWebSite/.classpath
	ModinifyWebSite/.gitignore
	ModinifyWebSite/.settings/org.eclipse.wst.common.component
	ModinifyWebSite/src/main/webapp/WEB-INF/classes/.gitignore