jquery front-page and topics
Merge branch 'master' into front-end
actual changes
fixed merge
Merge pull request #68 from elyotli/front-end

Front end