JS framework for jquery plugin
Merge remote-tracking branch 'upstream/master'
added first version of squishify interface
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
mini version
merge
merge
merge conflicts fixed