fixed adaptiveScale , crop scale now use cv2
reverted tests.py
removed creating new matrix where not required
merging ascale into display

splay

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
removed set fit method
shapes list added
fullscreen stuff
reset wrong commit
Merge pull request #3 from rajatkapoor/issue1

shapes list added
Merge remote-tracking branch 'origin/display' into display
Implemented all diplay types and styles
mouse functions1
fixed syntax error
Merge pull request #6 from rajatkapoor/issue1

fixed syntax error
mouseX mouseY added, fixed small errors
Merge pull request #7 from rajatkapoor/issue4

Issue4
fullscreen issue fixed
Merge pull request #8 from rajatkapoor/fsfix

fullscreen issue fixed