implement annotation partially
in the middle of implementing annotation
working on annotation. Now switching to implement sign up/in
in the middle of implementing annotations
switching to master
solving merge conflict
add functionality for adding and saving annotations

commit to merge with master in order to use sig in/out features
commit to get updates for sign in/out
sync with master
sync with origin
sync with origin
Merge branch 'master' into add-annotation
fix conflict and merge with origin
annotation nearly finished,"
problem with .highlighted-text shall befixed
finish annotations, some refactoring and debuggig are needed
fix conflicts in gemfile.lock