Changed a word.
Added the lock function
Merge branch 'master' of github.com:kbladin/Modeling-project
Added textures. Still UVs not right.
Added textures
good old slimy thing
Changed cmake file
Merge branch 'cmake_test' of github.com:kbladin/Modeling-project into cmake_test
Merge conflict solved