changed name to ModMaven
Changed Names in main.html
post conflit resolution