added bootstrap, setup basic html, css, js files
"grabbing files ashley added"

Merge remote-tracking branch 'upstream/master'
playing around with the json thing