From 63318501074bb482569239fdd339ebf070d67eca Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 08:30:54 -0500 Subject: [PATCH 1/6] Create team.json --- Teams/Mirai/team.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Teams/Mirai/team.json diff --git a/Teams/Mirai/team.json b/Teams/Mirai/team.json new file mode 100644 index 0000000..8388524 --- /dev/null +++ b/Teams/Mirai/team.json @@ -0,0 +1,18 @@ +{ + "teamName": "Mirai", + "members": [ + { + "name": "Henry Velasquez", + "twitter": "WMAADev", + "koding": "HenryV10", + "location": "Grand Rapids, US" + }, + { + "name": "Brandon Azer", + "twitter": "AzerBrandon", + "koding": "a0z1e0r8", + "location": "Grand Rapids, US", + "lead": true + }, + ] +} From e1acd0033b16dbc1968ad578985cc25981a0521c Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 09:41:35 -0500 Subject: [PATCH 2/6] Create ABOUT.md --- Teams/Mirai/ABOUT.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Teams/Mirai/ABOUT.md diff --git a/Teams/Mirai/ABOUT.md b/Teams/Mirai/ABOUT.md new file mode 100644 index 0000000..4b568fe --- /dev/null +++ b/Teams/Mirai/ABOUT.md @@ -0,0 +1,22 @@ +#Welcome to our page! +(which is still being made) +We're team Mirai （未来） + + +#About Us +Neither of us have a lot of experience in anything specific, but we hope to learn a lot from being in this Hackathon (also our very first!) +We are both of Grand Rapids, Michigan and we are seniors at West Michigan Aviation Academy. + + +- Brandon Azer +Currently a senior in high school. My desired major in college in Computer Science. I have taken a small course in VB.net, curently learning +and developing an iOS application and learning Swift as I do that. I'm really interested in how programs work and I've started to make plans +for future projects as I learn new things. In my free time, I like to play Osu (music game) and games in general, play piano, +and learn Japanese. 大学後で、日本に住みたいです。 + + +- Henry Velasquez aka *MC Ultimate Slacker/Master Procrastinator* +I don't have much programing experience other than a course in VB.net but I would like to gain experience. One of my main hobbies is being part of First the robotics club. +I am deciding on Majoring in Mechanical Engineering or Computer Science. + + From b5cb6ee851216dfbc0a6a933b7d643c62b6a0681 Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 09:45:22 -0500 Subject: [PATCH 3/6] Update ABOUT.md --- Teams/Mirai/ABOUT.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Teams/Mirai/ABOUT.md b/Teams/Mirai/ABOUT.md index 4b568fe..c31096b 100644 --- a/Teams/Mirai/ABOUT.md +++ b/Teams/Mirai/ABOUT.md @@ -8,14 +8,11 @@ Neither of us have a lot of experience in anything specific, but we hope to lear We are both of Grand Rapids, Michigan and we are seniors at West Michigan Aviation Academy. -- Brandon Azer -Currently a senior in high school. My desired major in college in Computer Science. I have taken a small course in VB.net, curently learning -and developing an iOS application and learning Swift as I do that. I'm really interested in how programs work and I've started to make plans -for future projects as I learn new things. In my free time, I like to play Osu (music game) and games in general, play piano, -and learn Japanese. 大学後で、日本に住みたいです。 +- Brandon Azer - +Currently a senior in high school. My desired major in college in Computer Science. I have taken a small course in VB.net, curently learning and developing an iOS application and learning Swift as I do that. I'm really interested in how programs work and I've started to make plans for future projects as I learn new things. In my free time, I like to play Osu (music game) and games in general, play piano, and learn Japanese. 大学後で、日本に住みたいです。 -- Henry Velasquez aka *MC Ultimate Slacker/Master Procrastinator* +- Henry Velasquez aka *MC Ultimate Slacker/Master Procrastinator* - I don't have much programing experience other than a course in VB.net but I would like to gain experience. One of my main hobbies is being part of First the robotics club. I am deciding on Majoring in Mechanical Engineering or Computer Science. From 87d9f5ea23cc989ad416503f4dfb0a09eff25366 Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 09:46:13 -0500 Subject: [PATCH 4/6] Update ABOUT.md --- Teams/Mirai/ABOUT.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Teams/Mirai/ABOUT.md b/Teams/Mirai/ABOUT.md index c31096b..28788e4 100644 --- a/Teams/Mirai/ABOUT.md +++ b/Teams/Mirai/ABOUT.md @@ -1,6 +1,4 @@ -#Welcome to our page! -(which is still being made) -We're team Mirai （未来） +#Welcome, we're team Mirai （未来） #About Us From 76c7a82d52022dd410d7cc9091761419cb05dc55 Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 09:46:37 -0500 Subject: [PATCH 5/6] Update ABOUT.md --- Teams/Mirai/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Mirai/ABOUT.md b/Teams/Mirai/ABOUT.md index 28788e4..cbebf93 100644 --- a/Teams/Mirai/ABOUT.md +++ b/Teams/Mirai/ABOUT.md @@ -1,4 +1,4 @@ -#Welcome, we're team Mirai （未来） +#Welcome, we're team Mirai （未来）！ #About Us From 9ffe4a74a5bc3d68c0ad8caea491ff64f463db18 Mon Sep 17 00:00:00 2001 From: Brandon Azer Date: Wed, 3 Dec 2014 14:04:37 -0500 Subject: [PATCH 6/6] Update team.json --- Teams/Mirai/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Mirai/team.json b/Teams/Mirai/team.json index 8388524..2b71597 100644 --- a/Teams/Mirai/team.json +++ b/Teams/Mirai/team.json @@ -13,6 +13,6 @@ "koding": "a0z1e0r8", "location": "Grand Rapids, US", "lead": true - }, + } ] }