update
Merge branch 'master' of github.com:CzechHackathon2013/quit-smoking