Merge pull request #4 from bilougit/master

merging master into production
popover containing the word"s definition added+logout is under the user"s
redirect user to the main page if he has already been logged in