added rise to takePhoto
Merge branch 'master' of github.com:pcxelja/software
corected method