Merge branch 'pr/3'

Conflicts:
public/script.js
views/home.jade