Fixing fuck-up
Merge branch 'master' of https://github.com/AdamSherlaw/shelly

Conflicts:
	shelly
	shelly.xcworkspace/xcuserdata/Adam.xcuserdatad/UserInterfaceState.xcuserstate