proximity sensor
Merge branch 'master' of github.com:team3499/2014