diff --git a/_config.yml b/_config.yml index 33bc03d..9221e9f 100644 --- a/_config.yml +++ b/_config.yml @@ -90,7 +90,7 @@ authors: gravatar: github: bdferr twitter: - about: Brendan is an MSIS student from Virginia. In his free time, he writes articles about drug policy at ssdp.org/about/blog-contributors/brendan-ferreri-hanberry/ and at the-libertarian.co.uk, where he serves as an editor. + about: Brendan is an MSIS student from Virginia with an undergraduate degree in German. In his free time, he is attempting to improve his foreign language skills and doing subtitles for Amara.org. tlchristian: name: Thu-Mai Christian prof: false diff --git a/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md new file mode 100644 index 0000000..d54a3a3 --- /dev/null +++ b/_posts/2014-03-21-bdferr_gerbal_ncaa_post.md @@ -0,0 +1,17 @@ +--- +layout : post +author : + - grant + - bdferr +title : Grant and Brendan's collaboration +--- + +Brendan was at first confused about the placement of the NCAA repo; he had cloned it as ncaa inside of the spring2014 directory. Grant explained that “git repos do not live happily inside of each other,” so Brendan employed rm –rf ncaa. This one command removed all of the files in the ncaa directory, including all of the files in its subdirectories, then removed each subdirectory once it was empty, then removed the folder “ncaa” once it was empty. Brendan then respawned the ncaa directory outside of the spring2014 folder, so that it could have more Lebensraum. + +After cloning the NCAA github repo in nitrous, Brendan made a branch called “wisconsin” inside it. He added the requested labels and pushed the file to the master branch for Grant to pull down to his own fork and edit, and Grant similarly entered the labels for the Arizona team on a newly created "Arizona" branch and pushed the Arizona file to the origin. + +Brendan then pulled the Arizona file to his own fork and entered data about the Arizona Wildcats basketball team. Grant did the same for the Wisconsin Badgers. + +Brendan did not know anything about basketball, but after searching Wikipedia and an ESPN [page](http://espn.go.com/mens-college-basketball/tournament/history/_/team1/5229) which Google (through Startpage.com) brought him to, he was able to find the relevant data. + +Grant merged Brendan’s pull request [here](https://github.com/silshack/NCAA/pull/37), while Brendan merged Grant’s pull request [here](https://github.com/silshack/NCAA/pull/38). \ No newline at end of file diff --git a/_posts/2014-03-28-bdferrembeddedtweet.md b/_posts/2014-03-28-bdferrembeddedtweet.md new file mode 100644 index 0000000..11f2188 --- /dev/null +++ b/_posts/2014-03-28-bdferrembeddedtweet.md @@ -0,0 +1,11 @@ +--- +layout : post +author : bdferr +title : Bdferr's Embedded Tweet +--- +Here is my tweet. + +

My name is Brendan and I am making a tweet which does not propose an alternative theory of your conception.

— silshack (@silshack) March 26, 2014
+ + +That is all. \ No newline at end of file diff --git a/exercises.markdown b/exercises.markdown index efb07e6..30258dd 100644 --- a/exercises.markdown +++ b/exercises.markdown @@ -1,6 +1,6 @@ --- layout: default -title: "Exericises" +title: "Exercises" --- ## {{ site.course.number }} Exercises