work space changes
Merge branch 'master' of https://github.com/seanicus/sotn

Conflicts:
	.idea/workspace.xml