..

..
Merge branch 'master' of https://github.com/jltendler/Game2

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/expandedItems