Added button
Manual merge
Merge branch 'master' of github.com:ttalvila/Paivakirja