fixed camcorder prob
fixing conflict?
checked out demoscene
merge?
blenderstuff
confl
blender concept img
Merge remote-tracking branch 'origin/master'