image testing
Merge pull request #54 from nathantross/herokutest

image testing
Merge branch 'master' of https://github.com/nathantross/project2
adds macro funcitonality to test suite