SHA1
SHA1
Merge branch 'master' of https://github.com/Jotune/Cubbyhole

Conflicts:
	Cubbyhole/MainWindow.xaml.cs