Changed contents of some .html files

Changed contents of frontpage (if not logged in)
Changed the "About" and "Contact" links
Changed name from "Fly Latex" to "LaTeX Editor" (temporary)
User will always be redirected to "resolve merge conflict" page after
the popup shows up