wide building toon
Merge branch 'master' of https://github.com/AlexBoyd/MDMDesignJam

Conflicts:
DesignJam/Assets/textures/bob_texture_solid2.png.meta
DesignJam/Assets/wide building.unity
DesignJam/DesignJam-csharp.sln
DesignJam/DesignJam.sln
fix for textures
meta file fixing
Merge branch 'master' of https://github.com/AlexBoyd/MDMDesignJam