touch.js added
debug stuffia pois
Merge branch 'sprint_0'