Merge pull request #10 from marieshifeng/localMarie

Added README
Added login pages, need to fix Tomcat connection