another commit thing
Merge branch 'master' into Danny-doin
Button activated push to view controller - 3D modeling stuff
Button activated push to view controller

3D modeling stuff
Removed file that shouldn't be tracked
Merge branch 'Danny-doin'