removed weird file that I don't know how it got here
removed .DS_Store file
Merge branch 'gh-pages' of github.com:kchughes/kh into gh-pages
what is this
jsproject changes merge
made caption corrections
fixed image and colorbox issues