typo
Hide icons until Origami is fixed
Merge branch 'v3' of github.com:Financial-Times/next-header into remove-icons

Conflicts:
	templates/main.html
Merge pull request #46 from Financial-Times/remove-icons

Remove icons
Bump user model
Merge remote-tracking branch 'origin/v3'
Tidy up makefile
Fixing conflict
gitignore