Fixade touch-grejer.
Merge branch 'master' of https://github.com/Sebelino/Team18