tleung999/simplicity — pull request #42 by tleung999 (2014-08-19 21:45:16+00:00)
Title: Tuesday Merge with Master

Current Master with updated Controller, separated music functions, and fixes to Kendalls picture and camera module.