Test

//comment comment
Merge remote-tracking branch 'origin/master' into oscbaBranch
Updated rotate

Added code for when rotationPos == 1
Merge remote-tracking branch 'origin/oscbaBranch'