update from server
Merge branch 'master' of github.com:soonreal/talaka
reset og to stable version
add and edit