This text will be italic +This will also be italic
+ +This text will be bold +This will also be bold
+ +diff --git a/_config.yml b/_config.yml index 4117bf3..e62f30f 100644 --- a/_config.yml +++ b/_config.yml @@ -55,10 +55,11 @@ authors: name: Olivia Dorsey prof: false gravatar: - website: - github: + website: http://franklinmemories.com + github: odorsey twitter: - about: + about: Olivia is a senior BSIS student who is interested in web design/development and the digital humanities. Her hometown is Clayton, NC. + jgeer: name: James Geer prof: false @@ -112,17 +113,22 @@ authors: prof: false gravatar: website: - github: - twitter: + github: + twitter: about: smantooth: name: Stacey Mantooth prof: false - gravatar: + gravatar: d3277996b61f2805d4b971b62961bd4a website: - github: - twitter: - about: + github: allhailaugustus + twitter: allhailaugustus + about: | + Llamas graze steep slopes, + all lulled, sun-warmed and drowsy, + wind ruffling coats. + + Stacey likes short poems and Peruvian quadrupeds. gmclendon: name: Grant McLendon prof: false @@ -179,6 +185,14 @@ authors: github: kylerthecreator twitter: about: First year MSIS student, novice Githubber, avid coffee drinker. + asherman: + name: Amber Sherman + prof: false + gravatar: + website: + github: ans729 + twitter: + about: Amber is a 2nd year MLS student hoping to find a big girl job with a digital library or archive. atickner: name: Amanda Tickner prof: false @@ -195,11 +209,11 @@ authors: github: twitter: about: I am a BSIS student. I am looking forward to learning more about programming. I am still exploring career paths within the information science field. - zyu: + zekuny: name: Zekun Yu prof: false - gravatar: + gravatar: iyuzekun website: - github: + github: zekuny twitter: - about: + about: Yu is a first year MSIS student. He likes programming and wants to learn more from class. diff --git a/_posts/2012-08-26-Landons_Post.md b/_posts/2012-08-26-Landons_Post.md new file mode 100644 index 0000000..3a6ca15 --- /dev/null +++ b/_posts/2012-08-26-Landons_Post.md @@ -0,0 +1,12 @@ +--- +layout:post +author: lgrindheim +categories: post +--- + +*This text will be italic* +_This will also be italic_ + +**This text will be bold** +__This will also be bold__ + diff --git a/_posts/2013-08-26-Landons_Post.md b/_posts/2013-08-26-Landons_Post.md new file mode 100644 index 0000000..8f15395 --- /dev/null +++ b/_posts/2013-08-26-Landons_Post.md @@ -0,0 +1,12 @@ +--- +layout: post +author: lgrindheim +categories: post +--- + +*This text will be italic* +_This will also be italic_ + +**This text will be bold** +__This will also be bold__ + diff --git a/_posts/2013-8-26-carolines-post.md.markdown b/_posts/2013-08-26-carolines-post.md similarity index 69% rename from _posts/2013-8-26-carolines-post.md.markdown rename to _posts/2013-08-26-carolines-post.md index aa15933..84d3bd9 100644 --- a/_posts/2013-8-26-carolines-post.md.markdown +++ b/_posts/2013-08-26-carolines-post.md @@ -1,6 +1,6 @@ --- -layout:post -author:carolinp +layout: post +author: carolinp categories: post --- - [ ] here diff --git a/_posts/2013-08-26-zekuny-post.md b/_posts/2013-08-26-zekuny-post.md new file mode 100644 index 0000000..2527ab5 --- /dev/null +++ b/_posts/2013-08-26-zekuny-post.md @@ -0,0 +1,9 @@ +--- +layout: post +author: zekuny +categories: post +--- + +1. Ferrari http://www.ferrari.com/english/pages/home.aspx +2. Lamborghini http://www.lamborghini.com/en/home/ +3. Porsche http://www.porsche.com/ diff --git a/_posts/2013-08-27-staceys-post.md b/_posts/2013-08-27-staceys-post.md new file mode 100644 index 0000000..aa3f0d0 --- /dev/null +++ b/_posts/2013-08-27-staceys-post.md @@ -0,0 +1,18 @@ +--- +layout: post +author: smantooth +categories: post +--- + + +``` +__/\\\\\\\\\\\\\_____________________________________________/\\\_______________ + _\/\\\/////////\\\__________________________________________\/\\\_______________ + _\/\\\_______\/\\\__________________________________________\/\\\_______________ + _\/\\\\\\\\\\\\\\______/\\\\\________/\\\\\_____/\\\\\\\\\\_\/\\\_______________ + _\/\\\/////////\\\___/\\\///\\\____/\\\///\\\__\/\\\//////__\/\\\\\\\\\\________ + _\/\\\_______\/\\\__/\\\__\//\\\__/\\\__\//\\\_\/\\\\\\\\\\_\/\\\/////\\\_______ + _\/\\\_______\/\\\_\//\\\__/\\\__\//\\\__/\\\__\////////\\\_\/\\\___\/\\\_______ + _\/\\\\\\\\\\\\\/___\///\\\\\/____\///\\\\\/____/\\\\\\\\\\_\/\\\___\/\\\__/\\\_ + _\/////////////_______\/////________\/////_____\//////////__\///____\///__\///__ +``` diff --git a/_posts/2013-08-28-third-class.md b/_posts/2013-08-28-third-class.md index 67c47bf..3857d6c 100644 --- a/_posts/2013-08-28-third-class.md +++ b/_posts/2013-08-28-third-class.md @@ -15,13 +15,14 @@ Wednesday Aug 28th Readings: ### Mini lecture: Github roundup - A pull request is a wrapper around branch diffs +- #140 - "Fixes #134" is the magic phrase that closes issues - Look for examples! - We'll have more control over the flow from the command line - Milestones = assignments - One issue per assignment, please. Multiple PRs OK, just keep track of them. - post ideas - +- Michelle's forking question. ### Left over from last time: How Jekyll works - `_config.yml`: Where sitewide variables live diff --git a/_site/2012/08/26/Landons_Post.html b/_site/2012/08/26/Landons_Post.html new file mode 100644 index 0000000..16b74d5 --- /dev/null +++ b/_site/2012/08/26/Landons_Post.html @@ -0,0 +1,5 @@ +
This text will be italic +This will also be italic
+ +This text will be bold +This will also be bold
diff --git a/_site/2013/08/26/carolines-post.md.html b/_site/2013/08/26/carolines-post.md.html deleted file mode 100644 index 4f485ab..0000000 --- a/_site/2013/08/26/carolines-post.md.html +++ /dev/null @@ -1,6 +0,0 @@ -If you share a Pandora station over email, the link on the 'Listen' button will let you link to it below. No idea why they won't just give you the link.
-The titles below represent the seed that gives the station its vibe, but great pandora stations always have as many artist seeds as possible. And as few thumbs up as possible, since thumbs ups make the station repetitive.
-* Andy McKee - Acoustic guitar, mostly solo. No words.
-* Deadmaus - chill electronic beats. Few words.
-* Future Islands - 80s music mixed with 80s influenced electronica. Words.
-* Javelin - Soul influenced electronic. With horns and sweet bass lines. Some words.
-* LCD Soundsystem - Lyric-driven electronic music. Words.
-* Intelligent Hoodlum - Smart old-school hip hop. Words.
-* Justice - Faster electronic mixed with some rock influence. Some words.
-* MSTRKRFT - Techno. Some words.
+ syllabus + schedule + assignments + people + feedback + music +
++by Zekun Yu +
+ + + ++ syllabus + schedule + assignments + people + feedback + music +
++by Stacey Mantooth +
+ + + +__/\\\\\\\\\\\\\_____________________________________________/\\\_______________
+ _\/\\\/////////\\\__________________________________________\/\\\_______________
+ _\/\\\_______\/\\\__________________________________________\/\\\_______________
+ _\/\\\\\\\\\\\\\\______/\\\\\________/\\\\\_____/\\\\\\\\\\_\/\\\_______________
+ _\/\\\/////////\\\___/\\\///\\\____/\\\///\\\__\/\\\//////__\/\\\\\\\\\\________
+ _\/\\\_______\/\\\__/\\\__\//\\\__/\\\__\//\\\_\/\\\\\\\\\\_\/\\\/////\\\_______
+ _\/\\\_______\/\\\_\//\\\__/\\\__\//\\\__/\\\__\////////\\\_\/\\\___\/\\\_______
+ _\/\\\\\\\\\\\\\/___\///\\\\\/____\///\\\\\/____/\\\\\\\\\\_\/\\\___\/\\\__/\\\_
+ _\/////////////_______\/////________\/////_____\//////////__\///____\///__\///__
+