Commit to resolve local issues
Merge branch 'master' of https://github.com/v01pe/ExplorativeDesign

Conflicts:
	004_wheelchair/Assets/scene1.unity