Merging
Added sprite sheet
Merge branch 'master' of github.com:dcorwin/15237-project1