diff --git a/_data/people.yml b/_data/people.yml index ae0cb60..7d2e2d4 100644 --- a/_data/people.yml +++ b/_data/people.yml @@ -6,12 +6,11 @@ profx: bio: | Professor X is the leader and founder of X-Men. melody: - display_name: "Melody Kadenko" - webpage: "http://www.cs.washington.edu/homes/melody/" + display_name: "Scott Summers" + webpage: "http://en.wikipedia.org/wiki/Cyclops_(comics)" role: staff bio: | - Melody is our Program Director. She actually makes magic stuff happen. - And beware of the Spoon of Death. + Scott, also known as Cyclops, shoots lasers from his eyes, which makes him the perfect administrative assistant. wolverine: display_name: "Wolverine" @@ -27,4 +26,4 @@ storm: jean: display_name: "Jean Grey" role: alum - bio: "Ph.D., 2013. Now at Microsoft Research." \ No newline at end of file + bio: "Ph.D., 2013. Now at Microsoft Research." diff --git a/_layouts/post.html b/_layouts/post.html index 04e3586..5dc8aa5 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,7 +1,6 @@ --- layout: default --- -

{{ page.title }}

{{ page.date | date_to_string }}

diff --git a/_posts/2014-05-14-test.md b/_posts/2014-05-14-test.md index 2907f57..e56316f 100644 --- a/_posts/2014-05-14-test.md +++ b/_posts/2014-05-14-test.md @@ -2,4 +2,4 @@ layout: post shortnews: true --- -Testing .. Testing ... +This is a short notice of something that happened recently. Just a news update blurb in no great detail. diff --git a/_posts/2014-05-25-anothertest.md b/_posts/2014-05-25-anothertest.md new file mode 100644 index 0000000..faf09d9 --- /dev/null +++ b/_posts/2014-05-25-anothertest.md @@ -0,0 +1,7 @@ +--- +layout: post +title: "A Full Blog Post" +--- +Unlike a short news post, a blog post has its own page and lots of text. Text text text. + +Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. diff --git a/bib/pubs.bib b/bib/pubs.bib index 59aeb56..7b0d9c4 100644 --- a/bib/pubs.bib +++ b/bib/pubs.bib @@ -5,4 +5,3 @@ year = 2014, month = 5 } - diff --git a/code.md b/code.md index 0b4738e..1fe7d4c 100644 --- a/code.md +++ b/code.md @@ -2,9 +2,8 @@ layout: default title: Code --- -If you like this template, find our other code here: +This is an example of an additional page you could add to the site (and its navigation). - * [uwsampa on GitHub](https://github.com/uwsampa/) +If you like this template, find our group's other code here: -See the licensing terms within each project's codebase for the requisite legal -details. + * [uwsampa on GitHub](https://github.com/uwsampa/) diff --git a/index.html b/index.html index 87135fd..8b8b1a6 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,12 @@ layout: default title: Home notitle: true --- +
+

+ The Awesome Research Group at Example U does all sorts of + research. Here is a place where we tell you exactly what that is! +

+

News