From ec51d6babec85bb02fa40d4a6e3ccc8e90083f25 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:18:19 -0800 Subject: [PATCH 1/9] Team.json for Freebird team.json for Freebird --- Teams/Freebird/team.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Teams/Freebird/team.json diff --git a/Teams/Freebird/team.json b/Teams/Freebird/team.json new file mode 100644 index 0000000..2ab05c7 --- /dev/null +++ b/Teams/Freebird/team.json @@ -0,0 +1,17 @@ +{ + "teamName": "Freebird", + "members": [ + { + "name": "Josephine Tsay", + "twitter": "fromjosephine", + "koding": "josephine", + "location": "San Francisco, CA" + }, + { + "name": "Bhavna Mahadevan", + "twitter": "BHAVNATOR", + "koding": "bhavnator", + "location": "Santa Monica, CA" + } + ] +} From 88a1d9f4b1670c3c5dd5fb2cc3f254dd6226cf01 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:30:41 -0800 Subject: [PATCH 2/9] Added an about file Added an about file --- Teams/Freebird/ABOUT.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Teams/Freebird/ABOUT.md diff --git a/Teams/Freebird/ABOUT.md b/Teams/Freebird/ABOUT.md new file mode 100644 index 0000000..38efe5f --- /dev/null +++ b/Teams/Freebird/ABOUT.md @@ -0,0 +1,17 @@ +Team ByteMe +================ + +We're Bhavna and Josephine, here to have some fun while making cool stuff. We met at Carnegie Mellon University's Master of +Entertainment Technology Program, and have been friends ever since. Bhavna is a coder, Josephine is a designer, and we both like music +games, and art, so it really is a match made in tech heaven! + +About your team +=========================== + +| Bhavna: C#, Processing, Java, Python, C++ | Josephine: Illustrator, Photoshop, Sketch +|--- |--- |--- |--- +| ![Bhavna: C#, Processing, Java, Python, C++](https://pbs.twimg.com/profile_images/478676620517986304/lgYjxIYD.jpeg) | ![Josephine: Illustrator, Photoshop, Sketch](https://media.licdn.com/mpr/mpr/shrink_200_200/p/8/005/073/099/17a1172.jpg) | + + + + From 6d286cd483db0b7169ced26d37c094075637bb37 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:32:44 -0800 Subject: [PATCH 3/9] teamname changed teamname changed --- Teams/Freebird/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Freebird/team.json b/Teams/Freebird/team.json index 2ab05c7..025cc7f 100644 --- a/Teams/Freebird/team.json +++ b/Teams/Freebird/team.json @@ -1,5 +1,5 @@ { - "teamName": "Freebird", + "teamName": "ByteMe", "members": [ { "name": "Josephine Tsay", From f1a5990b632f7d801c904062ac8b471852d06f01 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:46:20 -0800 Subject: [PATCH 4/9] team.json team.json --- Teams/ByteMe/team.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Teams/ByteMe/team.json diff --git a/Teams/ByteMe/team.json b/Teams/ByteMe/team.json new file mode 100644 index 0000000..025cc7f --- /dev/null +++ b/Teams/ByteMe/team.json @@ -0,0 +1,17 @@ +{ + "teamName": "ByteMe", + "members": [ + { + "name": "Josephine Tsay", + "twitter": "fromjosephine", + "koding": "josephine", + "location": "San Francisco, CA" + }, + { + "name": "Bhavna Mahadevan", + "twitter": "BHAVNATOR", + "koding": "bhavnator", + "location": "Santa Monica, CA" + } + ] +} From 6cc7873e81eb8ef5e6c356c9cd005bbcda1e3fc8 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:46:58 -0800 Subject: [PATCH 5/9] ABOUT.md ABOUT.md --- Teams/ByteMe/ABOUT.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Teams/ByteMe/ABOUT.md diff --git a/Teams/ByteMe/ABOUT.md b/Teams/ByteMe/ABOUT.md new file mode 100644 index 0000000..cde56ae --- /dev/null +++ b/Teams/ByteMe/ABOUT.md @@ -0,0 +1,16 @@ +Team ByteMe +================ + +We're Bhavna and Josephine, here to have some fun while making cool stuff. We met at Carnegie Mellon University's Master of +Entertainment Technology Program, and have been friends ever since. Bhavna is a coder, Josephine is a designer, and we both like music +games, and art, so it really is a match made in tech heaven! + +About your team +=========================== + +| Bhavna: C#, Processing, Java, Python, C++ | Josephine: Illustrator, Photoshop, Sketch +|--- |--- |--- |--- +| ![Bhavna: C#, Processing, Java, Python, C++](https://pbs.twimg.com/profile_images/478676620517986304/lgYjxIYD.jpeg) | ![Josephine: Illustrator, Photoshop, Sketch](https://media.licdn.com/mpr/mpr/shrink_200_200/p/8/005/073/099/17a1172.jpg) | + + + From 53e43abe87d64718b1f866cdf912bda4da2db397 Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:48:44 -0800 Subject: [PATCH 6/9] edit text edit text --- Teams/ByteMe/ABOUT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/ByteMe/ABOUT.md b/Teams/ByteMe/ABOUT.md index cde56ae..b229659 100644 --- a/Teams/ByteMe/ABOUT.md +++ b/Teams/ByteMe/ABOUT.md @@ -1,8 +1,8 @@ Team ByteMe ================ -We're Bhavna and Josephine, here to have some fun while making cool stuff. We met at Carnegie Mellon University's Master of -Entertainment Technology Program, and have been friends ever since. Bhavna is a coder, Josephine is a designer, and we both like music +We're Bhavna and Josephine, here to have some fun while making cool stuff that people use. We met at Carnegie Mellon University's Master of +Entertainment Technology Program, and have been friends ever since. Bhavna is a coder; Josephine is a designer; we both like music, games, and art, so it really is a match made in tech heaven! About your team From 973bdee99b5667ff74594ec8eb7f31ed735f68be Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:53:21 -0800 Subject: [PATCH 7/9] Delete ABOUT.md --- Teams/Freebird/ABOUT.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Teams/Freebird/ABOUT.md diff --git a/Teams/Freebird/ABOUT.md b/Teams/Freebird/ABOUT.md deleted file mode 100644 index 38efe5f..0000000 --- a/Teams/Freebird/ABOUT.md +++ /dev/null @@ -1,17 +0,0 @@ -Team ByteMe -================ - -We're Bhavna and Josephine, here to have some fun while making cool stuff. We met at Carnegie Mellon University's Master of -Entertainment Technology Program, and have been friends ever since. Bhavna is a coder, Josephine is a designer, and we both like music -games, and art, so it really is a match made in tech heaven! - -About your team -=========================== - -| Bhavna: C#, Processing, Java, Python, C++ | Josephine: Illustrator, Photoshop, Sketch -|--- |--- |--- |--- -| ![Bhavna: C#, Processing, Java, Python, C++](https://pbs.twimg.com/profile_images/478676620517986304/lgYjxIYD.jpeg) | ![Josephine: Illustrator, Photoshop, Sketch](https://media.licdn.com/mpr/mpr/shrink_200_200/p/8/005/073/099/17a1172.jpg) | - - - - From fc703f3e443547eab1d09b8364910231bc295d2a Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 15:53:27 -0800 Subject: [PATCH 8/9] Delete team.json --- Teams/Freebird/team.json | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Teams/Freebird/team.json diff --git a/Teams/Freebird/team.json b/Teams/Freebird/team.json deleted file mode 100644 index 025cc7f..0000000 --- a/Teams/Freebird/team.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "teamName": "ByteMe", - "members": [ - { - "name": "Josephine Tsay", - "twitter": "fromjosephine", - "koding": "josephine", - "location": "San Francisco, CA" - }, - { - "name": "Bhavna Mahadevan", - "twitter": "BHAVNATOR", - "koding": "bhavnator", - "location": "Santa Monica, CA" - } - ] -} From 8cb42799c7f39a96cc290770d4c1506703d4da5f Mon Sep 17 00:00:00 2001 From: dreamscape626 Date: Wed, 26 Nov 2014 16:15:39 -0800 Subject: [PATCH 9/9] CA to US CA to US --- Teams/ByteMe/team.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/ByteMe/team.json b/Teams/ByteMe/team.json index 025cc7f..db775df 100644 --- a/Teams/ByteMe/team.json +++ b/Teams/ByteMe/team.json @@ -5,13 +5,13 @@ "name": "Josephine Tsay", "twitter": "fromjosephine", "koding": "josephine", - "location": "San Francisco, CA" + "location": "San Francisco, US" }, { "name": "Bhavna Mahadevan", "twitter": "BHAVNATOR", "koding": "bhavnator", - "location": "Santa Monica, CA" + "location": "Santa Monica, US" } ] }