commit for merge
Merge branch 'master' of github.com:marshall62/mathspring

Conflicts:
	.idea/workspace.xml
Repaired missing if statment so that events are handled