make master compile, rename png
Merge pull request #117 from reidbaker/master_clean_up

make master compile, rename png