Upgrade bootstrap, local style changes
Layout, small merges, re-add ICD
Mac OS gitignore
Merge remote-tracking branch 'origin/master' into kenneth

Conflicts:
	KramersGeo/src/main/webapp/css/project.css
	KramersGeo/src/main/webapp/index.html
Delete merge files
Fix CSS link
Remove unused image
Layout, JS
Add map interactivity
Spelling
syntax
Merge pull request #2 from eivinwi/kenneth

Kenneth