Adding annotate
Fixing merge
Merge branch 'master' into login
Creating basics of login