Merge pull request #104 from jjliang/umass_branch

Umass branch
Merge branch 'umass_branch' into staging
Merge branch 'umass_branch' into staging
Merge branch 'umass_branch' into staging
made the main landing page slide show
Merge branch 'umass_branch' into staging
changed main landing picture
commented out the gmaps on the home page not displaying correctly
Merge remote-tracking branch 'upstream/umass_branch' into umass_branch
'fetched_stuff'