Quick Commit (Node Modules 2)
Merge branch 'master' of https://github.com/ctomni231/cwtactics

Conflicts:
	gameSrc/renderer.js
	gameSrc/statemachine.js
Quick Commit (Node Modules 3)

This is to make sure that the node_modules folder does not end up in the Windows build.