Resource icons
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev