remove .DS_Store
	deleted:    .DS_Store
	modified:   .gitignore
Merge pull request #1 from mys721tx/master

remove .DS_Store
change .gitignore

add .DS_Store to the list.
Merge pull request #2 from mys721tx/master

change .gitignore
Merge branch 'master' of github.com:briggslab/briggslab.github.io
Updated the weekly blog
Migriating to the new manifest
special category "principal-investigator", "graduate", "undergraduates",
"alumni-and-favored-guests" are reversed for coresponding roles. Bio
could be edited by editing the post with your name. The bio will
automatically display a JPEG file which has the slugified version of
your name.

modified:   _includes/banner.html
modified:   _includes/footer.html
modified:   _includes/header.html
modified:   _includes/javascript.html
deleted:    _includes/people/adams_a.html
deleted:    _includes/people/briggs_c.html
deleted:    _includes/people/jani_a.html
deleted:    _includes/people/latto_j.html
deleted:    _includes/people/macdonald_a.html
deleted:    _includes/people/scooter.html
deleted:    _includes/people/smith_t.html
deleted:    _includes/people/toothman_m.html
deleted:    _includes/people/wilber_m.html
deleted:    _includes/people/wilson_e.html
new file:   _layouts/people.html
modified:   _posts/2014-02-27-the-night-before-esa.markdown
new file:   _posts/2014-02-28-andrea-adams.markdown
new file:   _posts/2014-02-28-andrea-jani.markdown
new file:   _posts/2014-02-28-andy-macdonald.markdown
new file:   _posts/2014-02-28-cherie-briggs.markdown
new file:   _posts/2014-02-28-emily-wilson.markdown
modified:   _posts/2014-02-28-inaugural-weekly-blog.markdown
new file:   _posts/2014-02-28-john-latto.markdown
new file:   _posts/2014-02-28-mark-wilber.markdown
new file:   _posts/2014-02-28-mary-toothman.markdown
new file:   _posts/2014-02-28-scooter.markdown
new file:   _posts/2014-02-28-tom-smith.markdown
new file:   _posts/2014-02-28-yishen-miao.markdown
modified:   blog.html
deleted:    people.html
new file:   people/index.html
Merge pull request #10 from mys721tx/master

Migriating to the new manifest
change list to table
modified:   people/index.html
Merge pull request #11 from mys721tx/master

change list to table
TomCSmith made first blog post
renamed:    2014-03-01-GnomeStudies.markdown -> 2014-03-01-gnome-studies.markdown
change list to table
modified:   people/index.html
Updated the weekly blog post
Merge branch 'master' of github.com:briggslab/briggslab.github.io
Fixed some typos in weekly blog post
TomCSmith made first blog post
Fixed conflict
Added Andy's weekly blurb
Updating banner

The banner is updated per #12.

modified:   _includes/banner.html
renamed:    index.html -> about-us.html
modified:   contact.html
renamed:    blog.html -> index.html
new file:   prospective-student.html
modified:   about-us.html
Added Andrea As weekly blurb