commit message:wq
Locally added . files
Merge branch 'master' of github.com:We-Have-Names-Actually/WSW

Conflicts:
	Spelunker/.classpath
	Spelunker/.project
	Spelunker/src/Wrapper.java