Merge branch 'linda'
new map
Merge remote-tracking branch 'upstream/master'

Conflicts:
	groups/4/index.html
merge fixes
For Linda
commit
merge
index
For Linda
http to jquery
page add links
got rid of image
object positions, about page, navigation
deleted quad
For Linda
deletes
my commit
about, newhouse, building style, map
newhouse
about, style.css, added remembrance wall