..
Merge branch 'master' of github.com:bangerang/Timevault

Conflicts:
	TimeVault.xcworkspace/xcuserdata/Johan.xcuserdatad/UserInterfaceState.xcuserstate