Added Stuff, trying to fix merge error
Added some icons
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/heyx3/PointAndClick