Added png support
Merge branch 'master' of https://github.com/jasonpeng/cs3246-assignment2