resolve local conflicts in ubuntu
Merge branch 'master' of github.com:winmad/Winmad-s-raytracer-v1.0
add bpt for experiment