Merge branch 'master' of https://github.com/jacob-g/scratchwikiskin
Merge branch 'master' of github.com:LLK/scratchwikiskin
Merge branch 'master' of https://github.com/jacob-g/scratchwikiskin
fixed image resizing
Merge branch 'master' of github.com:LLK/scratchwikiskin