State update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
I'm tired of things in this folder showing up as in conflict.