Merge branch 'autosave' of https://github.com/grantemsley/DnD4eCM

Conflicts:
	DnD4e Combat Manager/bin/Release/DnD4e Combat Manager.exe
	bin/Release/DnD4e Combat Manager.pdb