merged readmes from github
Merge branch 'master' into development
working on scale
scale now accepts %, width, or height
added caching header for browsers
added some comments
Merge branch 'development'