Merge branch 'master' into chstr_branch
commit

more zTXt changes
commit

zTXt complete
commit

zTXt complete
commit

tIMe
commit

added file invalidity checks
commit

time and invalidity checks
commit

tIMe works
commit
commit

png part works completely
Merge branch 'chstr_branch'
commit

png complete
Merge branch 'chstr_branch'
commit

patched potential bug
commit
commit
Merge branch 'chstr_branch'
Merge branch 'master' of https://github.com/chstrchu/CS161-Project-1