Merge branch 'master' of https://github.com/JamesWhiteAtx/JPW

Conflicts:
	project.xml
added ignore project.xml
Merge branch 'master' of https://github.com/JamesWhiteAtx/JPW

Conflicts:
	project.xml