merge with eric jcrop
Merge branch 'master' of github.com:eatmorespinach/my_project
image crop is now working huzazzzzahhhhhh