some ignoring things
Merge branch 'master' of https://github.com/2ATeam/StatiX
Merge branch 'master' of https://github.com/2ATeam/StatiX
sticking feature implemented