feedback + shit
Merge branch 'master' of github.com:JulesMarcil/Twinkler1.2.3