add john.js
some api added
base template language js
Setup initial HTML structure
Merge branch 'dev' into Richard
work
Merge branch 'dev' into johnworking
added john.js to index and initial var to john.js
api call to news working
first try with api connects
calling flickr seems to be working
Finish tab functionality
received json response
map embedded
menu api sectioned
merge menu api working
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