added accelerometer view controller
merge conflicts