add Touchpad to carousel
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/PWrGitHub194238/project2013-2014.git