test
Merge pull request #3 from notandrewkaye/master

Move to Develop
test
added some people
colors maybe
Added Events content. Linkified people and partners on People page. Changed CSS so that a tags in content will be underlined.
Deleted _posts/2014-02-09-notandrewkaye-test-post.md
Deleted _posts/2014-02-09-prose-test.md
Deleted _posts/2014-02-09-second-test-post.md
Deleted _posts/2014-02-09-this-is-awesome.md
Deleted _posts/2014-02-10-my-project.md
Deleted _posts/2014-02-10-this-is-my-project.md
Created 2014-02-12-zetamaze.md
Created 2014-02-12-zetamaze.md
Updated 2014-02-12-zetamaze.md
Updated 2014-02-12-zetamaze.md
Updated 2014-02-12-zetamaze.md
Removed filler posts in Projects page. Added Zetamaze project. Modified post layout so that post name and date etc... are rendered above the splash image. Felt more natural. Feel free to change back
Merge pull request #6 from brannondorsey/develop

 People, Events, and a little Projects (second request)
Merge pull request #8 from olab-io/develop

Develop