removed redundant function names, added pngs
fixed some stuff and some things
Merge branch 'kyle'