added ellipsetest
obj self rotation
merge finished