fix
fix merge
Merge branch 'master' of github.com:secretariat/logophone
Merge branch 'master' of github.com:secretariat/logophone
before merge fixes
after merge fixes
remove log from gitignore
merge fixes
slide blocs
slide blocs
slide blocs
fix
resolve merge
slide blocs + answers
resolve merge
js fix try 1
js fix try 2
Merge branch 'master' of github.com:secretariat/logophone
intro added
Merge branch 'master' into test