retina and captions
gitignore
gitignore
dss
merged
prevented js errors
Merge branch 'master' of github-as-matt:mhmaguire/westlake