cleaned up functions, added tests script
Merge branch 'master' of github.com:bburns/contentAwareResizing

Conflicts:
	tests.m