test commit

added comment in png.c
Merge branch 'Michel'
Merge branch 'master' into Michel
initial work on jpg.c
Merge branch 'Michel'
Merge branch 'master' of https://github.com/chstrchu/CS161-Project-1
Merge branch 'master' of https://github.com/chstrchu/CS161-Project-1
Merge branch 'master' into chstr_branch