collision
Merge branch 'master' of https://github.com/Zalastra/CandyRain.git
merge collision + images + cleanup code a little bit