Tuesday Merge with Master

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