bootstrap - index page
adding new files
fixed conflicts
caseys bootstrap
jan's tables