Merge pull request #14 from keymholio/miguel_changes

Sprint 4
Merge pull request #15 from keymholio/miguel_changes

Sprint 4.5
Redirect to https
Changes to web.js
Revert https
Added fontawesome in bower.json file
Trying to fix Codeship deployment
Changed express config and upgraded express in package.json
resolve master conflict