add john.js
Merge branch 'dev' into johnworking
added john.js to index and initial var to john.js
api call to news working
calling flickr seems to be working
received json response
map embedded
updated location links and added font size 62.5% to body
added script for menu item in html
fixed merge conflicts
added styles to dean scss doc and updated Our Location layout
merged from dev
added border and padding to news box
Merge branch 'dev' into johnworking
merges
attempt at filter