Added + - * / operations for image X image and a basic tester. Also changed some things in the skeleton files so that they'll compile. I also wrote some methods for distorting images and adding colors, but I can't figure out where to stick them yet
merge conflicts
Merge branch 'master' of github.com:kevin-roark/arthur
Commented out last 2 methods for now