small commit
fixing merge conflict
fixing line on pop up of front page
Merge pull request #94 from kdoyne/animation

Small fix for line on front page view.