Merge branch 'master' of https://github.com/xyclos/hackerNews

Conflicts:
controllers.js
update controller.js