Pre pull commit
Ugh git!
Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	Settings/SD.pmo
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$FrameListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class
	target/maven-archiver/pom.properties
Change .gitignore, and remove wmv as a choice for file open