Merge branch 'master' of https://github.com/joeyuan19/POIExtension

Conflicts:
	POIExtension/.gitignore
changes on pc
edits