merging with origin master
merging with master
merged with origin master
added landing page controller and view and links to find a job, post a job
added links to sign in page for posting a job
map icons added
Merge branch 'landing_page' of github.com:federicomaffei/WorkMap
new landing page added
merged with maps layout branch
filter checkbox added
pulling from master
working on maps.js
added poltergeist and updated a map test to use it
fixed merge conflict
first filter working
Merge branch 'poltergeist' of github.com:federicomaffei/WorkMap
merge with new css layout
merge with styling
updated map colour and header colour, to demo for the next standup