comment

added comment to json.js file in order to merge branches.
CSS fixes

trying to get images online
comments

trying to merge/sync the branches