front end modal working
Conflicts resolved
Merge pull request #10 from lalogf/master

Added modal to login page