Preparing to make a beta branch. Looks like the 2x and 3x scale image options were removed on the images.
Pulled
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S4_Team6