nothing
Merge branch 'master' of https://github.com/onebeartoe/PIXEL

Conflicts:
	pixel-pc/src/main/java/com/ledpixelart/pc/PixelApp.java
added an icon for the my images folder
Merge branch 'master' of https://github.com/onebeartoe/PIXEL

Conflicts:
	pixel-pc/src/main/java/com/ledpixelart/pc/PixelApp.java