added styling for home page
added marijuana css animation circle ; added css border menu.
fixed merge conflicts