Some stuff
Merging in master - some conflicts
Adding in browserify
Merge branch 'master' of https://github.com/Financial-Times/next-engels into search-box
Now seems as good a time as any...
Is working - now just needs styling
working autocomplete
Manual merge of master
little fix
Tweak to makefile
Small fixes to jshint
Removing DS_Store
Merge branch 'search-box' of https://github.com/Financial-Times/next-engels into search-box
Merge branch 'master' of https://github.com/Financial-Times/next-engels into search-box
Move *.jpg to static folder
Merge pull request #16 from Financial-Times/search-box

Search box