added cone.bmp
Merge branch 'master' of ssh://github.com/adriangerbaud/FinalProject