Made photosensor.java working
Merge with merge-me!