fixed someone elses merge conflict
added landing page
fix js title
merging
Merge branch 'master' of https://github.com/TheoT/OJFinal
merging
changed default follow page