merging branch rotate2.html back to rotate.html