Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #37

Open
wants to merge 220 commits into
base: gh-pages
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
3a6ea41
Added back README to master branch
Aug 24, 2016
c459f43
Removed css author stamps
Aug 24, 2016
094f6fe
Merge pull request #32 from cmattrex/master
Aug 26, 2016
0817bfe
Delete CNAME
Aug 26, 2016
a4a8390
Added minor pagination fixes
Aug 26, 2016
43de09b
Added sitemap generation via plugin
Aug 26, 2016
d5f7518
Added custom _pages directory
Aug 26, 2016
be91c10
Added gemfile, added atom feed generation plugin
Aug 26, 2016
f92d31c
Added a sitemap generation plugin
Aug 26, 2016
50a9830
Reorganized files to be cleaner
Aug 26, 2016
6f9df45
Migrated seo tag generation to the official plugin
Aug 26, 2016
25ce9ad
Added a gemfile.lock gitignore
Aug 26, 2016
91d2a8b
Removed gemfile.lock from repo
Aug 26, 2016
5d3eb04
Removed gitattributes and gitmodules
Aug 26, 2016
10808f6
Removed github pages from the gemfile
Aug 26, 2016
4ff353e
Updated dependencies
Aug 26, 2016
15a9f9d
Updated fonts
Aug 26, 2016
6cbe2a6
Updated font awesome
Aug 26, 2016
444cf35
Revert "Updated font awesome"
Aug 26, 2016
ffe2eb8
Revert "Revert "Updated font awesome""
Aug 26, 2016
3010428
Font-Awesome Fixes
Aug 26, 2016
dbe5f74
Minor functionality fixes
Aug 27, 2016
9e3b587
Fixed stuff broken by the update
Aug 27, 2016
91128a2
Fixed remaining broken stuff
Aug 27, 2016
39d2084
Updated README
Aug 30, 2016
173aea2
Minor style updates
Aug 30, 2016
5e071b2
Updates sync
Aug 31, 2016
f5b30c8
Removed redundant data folder
Aug 31, 2016
8ae3d47
Made all links relative
Aug 31, 2016
8b135b9
Fixed footer not animating
Aug 31, 2016
03a8a20
Update _config.yml
abhi-bhattaru Oct 23, 2016
f0bec52
Create 2016-09-10-Welcome-to-Velocity-Vortex.md
abhi-bhattaru Oct 23, 2016
67e6150
Update 2016-09-10-Welcome-to-Velocity-Vortex.md
abhi-bhattaru Oct 23, 2016
0d67575
Create 2016-09-17-Brainstorm.md
abhi-bhattaru Oct 23, 2016
4e1fb7e
Create 2016-10-15-Successful-Base.html
abhi-bhattaru Oct 23, 2016
a68f19f
Update 2016-09-17-Brainstorm.md
abhi-bhattaru Oct 23, 2016
d7070f0
Delete default_bg.jpg
abhi-bhattaru Oct 23, 2016
cb25a2a
Delete sangeh-monkey-forest-10.jpg
abhi-bhattaru Oct 23, 2016
2e554ca
Add files via upload
abhi-bhattaru Oct 23, 2016
e9d385f
Update about.md
abhi-bhattaru Oct 23, 2016
a58237b
Update about.md
abhi-bhattaru Oct 23, 2016
688fd9c
Delete favicon.png
abhi-bhattaru Oct 23, 2016
cde81fd
Add files via upload
abhi-bhattaru Oct 23, 2016
dc4c56a
Delete favicon.ico
abhi-bhattaru Oct 23, 2016
13abbc3
Add files via upload
abhi-bhattaru Oct 23, 2016
1306455
Delete apple-touch-icon-precomposed.png
abhi-bhattaru Oct 23, 2016
38e4762
Delete apple-touch-icon-72x72-precomposed.png
abhi-bhattaru Oct 23, 2016
7d87c37
Delete apple-touch-icon-144x144-precomposed.png
abhi-bhattaru Oct 23, 2016
c1d943e
Delete apple-touch-icon-114x114-precomposed.png
abhi-bhattaru Oct 23, 2016
2078edf
Add files via upload
abhi-bhattaru Oct 23, 2016
87a69c0
Delete omikron.png
abhi-bhattaru Oct 23, 2016
66b79af
Add files via upload
abhi-bhattaru Oct 23, 2016
d10f891
Update README.md
abhi-bhattaru Oct 23, 2016
4917402
Update _config.yml
abhi-bhattaru Oct 23, 2016
bca61d5
Update about.md
abhi-bhattaru Oct 23, 2016
e7f9331
Add files via upload
abhi-bhattaru Oct 23, 2016
9e6b314
Update _config.yml
abhi-bhattaru Oct 23, 2016
3feba49
Update _config.yml
abhi-bhattaru Oct 23, 2016
f5859c6
Delete backround.png
abhi-bhattaru Oct 23, 2016
3c1680b
Delete default_bg.jpg
abhi-bhattaru Oct 23, 2016
5b85eaf
Add files via upload
abhi-bhattaru Oct 23, 2016
8133b2f
Delete default_bg.jpg
abhi-bhattaru Oct 23, 2016
c422cd9
Add files via upload
abhi-bhattaru Oct 23, 2016
217da33
Add files via upload
abhi-bhattaru Oct 23, 2016
5f257c2
Delete default_bg.jpg
abhi-bhattaru Oct 23, 2016
f5ab05d
Add files via upload
abhi-bhattaru Oct 23, 2016
f470165
Delete README.md
abhi-bhattaru Nov 21, 2016
1856c2b
Add files via upload
abhi-bhattaru Dec 10, 2016
65dab9c
Update about.md
abhi-bhattaru Dec 10, 2016
90893c6
Delete GroupPicture.JPG
abhi-bhattaru Dec 10, 2016
d495b20
Add files via upload
abhi-bhattaru Dec 10, 2016
9aa9ed4
Create 2016-12-10-A-Strive.html
abhi-bhattaru Dec 13, 2016
c5a6002
Create 2016-12-17-Rohith-es-retard0.md
abhi-bhattaru Dec 17, 2016
a037cde
Update 2016-12-17-Rohith-es-retard0.md
abhi-bhattaru Dec 17, 2016
af6715d
Update 2016-12-17-Rohith-es-retard0.md
abhi-bhattaru Dec 17, 2016
83ace54
Delete 2016-12-17-Rohith-es-retard0.md
abhi-bhattaru Dec 17, 2016
6e43f85
Create 2016-12-17-Charlotte.md
abhi-bhattaru Dec 17, 2016
0b9099c
Update 2016-12-17-Charlotte.md
abhi-bhattaru Dec 17, 2016
7252085
Update 2016-12-17-Charlotte.md
abhi-bhattaru Dec 17, 2016
6bbaebd
Delete 2016-12-17-Charlotte.md
abhi-bhattaru Dec 17, 2016
01802ca
Create hi
abhi-bhattaru Dec 18, 2016
8379515
Update 2016-12-10-A-Strive.html
abhi-bhattaru Dec 18, 2016
6476939
Update and rename hi to 2016-12-17-B4-Scrimmage.html
abhi-bhattaru Dec 18, 2016
b76dcca
Update _config.yml
abhi-bhattaru Dec 18, 2016
8c739b0
Delete 2015-8-23-MarkdownTest.md
abhi-bhattaru Dec 18, 2016
dece1e3
Update 2016-12-17-B4-Scrimmage.html
abhi-bhattaru Dec 19, 2016
8aa3aef
Create The Scrimmage Post
abhi-bhattaru Dec 19, 2016
4bda4fc
Update The Scrimmage Post
abhi-bhattaru Dec 23, 2016
9c007d3
Update and rename The Scrimmage Post to 2016-12-19-Scrimmage2.html
abhi-bhattaru Dec 23, 2016
24c240d
Update 2016-12-19-Scrimmage2.html
abhi-bhattaru Dec 23, 2016
a9a679a
Rename 2016-12-19-Scrimmage2.html to 2016-12-19-Scrimmage.html
abhi-bhattaru Dec 23, 2016
a80f733
Create Checklist.html
abhi-bhattaru Dec 24, 2016
a9db4ee
Rename Checklist.html to 2016-01-01-Checklist.html
abhi-bhattaru Dec 24, 2016
a47ba0b
Update _config.yml
abhi-bhattaru Dec 24, 2016
e1f063a
Rename 2016-01-01-Checklist.html to 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
fe7fd0e
Update _config.yml
abhi-bhattaru Dec 24, 2016
c370810
Update 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
7d9c315
Update 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
644df44
Update 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
14d1036
Update 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
4bcc736
Update 2016-01-01-Robot-Checklist.html
abhi-bhattaru Dec 24, 2016
4e9c500
Create 2016-12-24-Christmas.html
abhi-bhattaru Dec 29, 2016
e48d7fd
Update home.html
abhi-bhattaru Dec 30, 2016
a429b30
Update home.html
abhi-bhattaru Dec 30, 2016
0ee195b
Update page.html
abhi-bhattaru Dec 30, 2016
9d5433f
Update page.html
abhi-bhattaru Dec 30, 2016
ce0ca89
Update post.html
abhi-bhattaru Dec 30, 2016
5346ffa
Update post.html
abhi-bhattaru Dec 30, 2016
a9952c7
Update page.html
abhi-bhattaru Dec 30, 2016
1c7ce3a
Update _config.yml
abhi-bhattaru Dec 30, 2016
a47cfad
Update signoff.html
abhi-bhattaru Dec 30, 2016
4799cf3
Update 2016-12-24-Christmas.html
abhi-bhattaru Dec 30, 2016
5dc792a
Update signoff.html
abhi-bhattaru Dec 30, 2016
b894544
Update 2016-12-24-Christmas.html
abhi-bhattaru Dec 30, 2016
250631b
Update _config.yml
abhi-bhattaru Dec 30, 2016
9e606c5
Update signoff.html
abhi-bhattaru Dec 30, 2016
57de886
Update 2016-12-24-Christmas.html
shoegze Dec 30, 2016
a49fb16
Add files via upload
abhi-bhattaru Jan 5, 2017
1d96c66
Update and rename about.md to about.html
abhi-bhattaru Jan 5, 2017
d04c8e4
Update about.html
abhi-bhattaru Jan 6, 2017
adf5405
Update about.html
abhi-bhattaru Jan 6, 2017
3208c0b
Update about.html
abhi-bhattaru Jan 6, 2017
982ea68
update my mentor info
pondersome Jan 6, 2017
0654d9d
fix image locations
pondersome Jan 6, 2017
efe60e5
Add files via upload
imperialroboticsblog Jan 6, 2017
90e518e
Update about.html
imperialroboticsblog Jan 6, 2017
aff82ca
Update about.html
imperialroboticsblog Jan 6, 2017
bfdfc66
Add files via upload
imperialroboticsblog Jan 6, 2017
52ba19c
Update about.html
imperialroboticsblog Jan 6, 2017
2149192
Update about.html
imperialroboticsblog Jan 6, 2017
16423ec
Update about.html
pondersome Jan 6, 2017
da1f6f2
Add files via upload
shoegze Jan 7, 2017
14f7488
Delete MichaelSharp.9fe8ce3b6740432aa39004b5dfc4c994
shoegze Jan 7, 2017
efdd3ec
Add files via upload
shoegze Jan 7, 2017
8a2b7a0
Update about.html
shoegze Jan 7, 2017
4f23926
Update about.html
shoegze Jan 7, 2017
1c18b0d
Add files via upload
shoegze Jan 7, 2017
d2d2926
Update about.html
shoegze Jan 7, 2017
d92c9bc
Update about.html
imperialroboticsblog Jan 7, 2017
0021bec
Add files via upload
shoegze Jan 7, 2017
ecebe36
Update about.html
shoegze Jan 7, 2017
fe935a0
Add files via upload
shoegze Jan 7, 2017
980d6a6
Update about.html
shoegze Jan 7, 2017
c88cb37
Delete max.JPG
shoegze Jan 7, 2017
46a49f8
Add files via upload
shoegze Jan 7, 2017
6748ff2
Delete max.png
shoegze Jan 7, 2017
6da32e2
Add files via upload
shoegze Jan 7, 2017
eb50fe4
Delete max.png
shoegze Jan 7, 2017
d7df145
Add files via upload
shoegze Jan 7, 2017
2034e19
Delete max.png
shoegze Jan 7, 2017
1380698
Add files via upload
shoegze Jan 7, 2017
8a4fa54
Delete max.png
shoegze Jan 7, 2017
49a4ba1
Add files via upload
shoegze Jan 7, 2017
b7c6e6d
Update about.html
shoegze Jan 7, 2017
3001da4
Update _config.yml
imperialroboticsblog Jan 7, 2017
dad9e7a
Create Calendar.html
imperialroboticsblog Jan 7, 2017
ed5a7c9
Delete max.png
shoegze Jan 7, 2017
be7ecb2
Update Calendar.html
imperialroboticsblog Jan 7, 2017
a1051de
Add files via upload
shoegze Jan 7, 2017
eb8c467
Add files via upload
shoegze Jan 7, 2017
ee706be
Update about.html
shoegze Jan 7, 2017
0675c6b
Update about.html
shoegze Jan 7, 2017
fb84558
Add files via upload
shoegze Jan 7, 2017
6b5aca5
Update about.html
shoegze Jan 7, 2017
845c648
Update about.html
shoegze Jan 7, 2017
654c9fa
Update about.html
shoegze Jan 7, 2017
d49b7d8
Add files via upload
shoegze Jan 7, 2017
4bad2d7
Update about.html
shoegze Jan 7, 2017
947d6cb
Update about.html
r25ohit Jan 8, 2017
a6117b5
Update about.html
abhi-bhattaru Jan 8, 2017
9b32da7
Update about.html
imperialroboticsblog Jan 8, 2017
47e4e5e
Add files via upload
imperialroboticsblog Jan 9, 2017
41087e8
Update about.html
imperialroboticsblog Jan 9, 2017
14eecc1
Update about.html
imperialroboticsblog Jan 9, 2017
b0fde95
Delete coming soon.jpg
imperialroboticsblog Jan 9, 2017
f3a6c9b
Add files via upload
imperialroboticsblog Jan 9, 2017
389a068
Delete coming soon.jpg
imperialroboticsblog Jan 9, 2017
f2c914a
Add files via upload
imperialroboticsblog Jan 9, 2017
ffe9952
Delete coming soon.jpg
imperialroboticsblog Jan 9, 2017
67b2a0e
Add files via upload
imperialroboticsblog Jan 9, 2017
34e11fd
Update about.html
imperialroboticsblog Jan 9, 2017
bf6d26f
Update about.html
r25ohit Jan 11, 2017
a797895
Update about.html
imperialroboticsblog Jan 11, 2017
ba02498
Update about.html
imperialroboticsblog Jan 15, 2017
ab95d1d
Create Preparing for the Qualifiers
imperialroboticsblog Jan 16, 2017
8da774e
Rename Preparing for the Qualifiers to Preparing-for-the-Qualifiers.html
imperialroboticsblog Jan 16, 2017
2c476e8
Rename Preparing-for-the-Qualifiers.html to 2017-01-16-Preparing-for-…
imperialroboticsblog Jan 16, 2017
f985c88
Add files via upload
abhi-bhattaru Jan 16, 2017
0330516
Update about.html
abhi-bhattaru Jan 16, 2017
ddd99f2
Add files via upload
abhi-bhattaru Jan 16, 2017
7c7e494
Update about.html
abhi-bhattaru Jan 16, 2017
52db484
Update about.html
imperialroboticsblog Jan 17, 2017
cca0042
Update about.html
imperialroboticsblog Jan 21, 2017
af75038
Create 2017-01-21-B4-Qualifiers.html
imperialroboticsblog Jan 22, 2017
e7554a1
Update about.html
imperialroboticsblog Jan 26, 2017
293ddf3
Update about.html
abhi-bhattaru Jan 27, 2017
e94a079
Create 2017-01-28-JanQualifier.INCOMPLETE
abhi-bhattaru Jan 31, 2017
d60fe4e
Update 2017-01-28-JanQualifier.INCOMPLETE
abhi-bhattaru Feb 1, 2017
2ec88f4
Update 2017-01-28-JanQualifier.INCOMPLETE
abhi-bhattaru Feb 1, 2017
6405a32
Rename 2017-01-28-JanQualifier.INCOMPLETE to 2017-01-28-JanQualifier.…
abhi-bhattaru Feb 1, 2017
7aec602
Create 2017-01-30-Day1.httttttttttt
abhi-bhattaru Feb 1, 2017
486f85d
Rename 2017-01-30-Day1.httttttttttt to 2017-01-30-Day1.html
abhi-bhattaru Feb 1, 2017
aacc323
Delete 2017-01-30-Day1.httttttttttt
abhi-bhattaru Feb 1, 2017
3fc8b5e
Update 2016-09-10-Welcome-to-Velocity-Vortex.md
maximomateo Oct 7, 2017
84f775e
Create 2017-09-14-Starting-Relic-Recovery.md
maximomateo Oct 7, 2017
9791a2e
Create 2017-09-14-starting-relic-recovery.md
maximomateo Oct 7, 2017
d7d6b1e
Rename 2017-09-14-starting-relic-recovery.md to 2017-09-14-starting-r…
maximomateo Oct 7, 2017
3bdde79
Update 2017-09-14-starting-relic-recovery.html
maximomateo Oct 7, 2017
5f595ca
Update 2017-09-14-starting-relic-recovery.html
maximomateo Oct 7, 2017
3c375bf
Update 2017-09-14-starting-relic-recovery.html
maximomateo Oct 7, 2017
9598ff2
Update 2017-09-14-starting-relic-recovery.html
maximomateo Oct 7, 2017
04360a8
Rename 2017-09-14-starting-relic-recovery.html to 2017-09-14-starting…
maximomateo Oct 7, 2017
06caac2
Rename 2017-09-14-starting-relic-recovery.md to 2017-10-7-starting-re…
maximomateo Oct 7, 2017
9314a09
Update 2017-10-7-starting-relic-recovery.md
maximomateo Oct 7, 2017
3233c16
Update 2017-10-7-starting-relic-recovery.md
maximomateo Oct 7, 2017
f41d8fb
Update 2017-10-7-starting-relic-recovery.md
maximomateo Oct 7, 2017
00ff9c2
Update 2017-10-7-starting-relic-recovery.md
maximomateo Oct 7, 2017
122ede3
Rename 2017-10-7-starting-relic-recovery.md to 2017-10-7-Starting-Rel…
maximomateo Oct 7, 2017
1b420d3
Update about.html
maximomateo Oct 7, 2017
b2f5422
Update about.html
maximomateo Oct 7, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update about.html
maximomateo authored Oct 7, 2017
commit 1b420d3cc2c490ef7baeffbb11e46be7e5195cb8
74 changes: 3 additions & 71 deletions _pages/about.html
Original file line number Diff line number Diff line change
@@ -12,17 +12,7 @@ <h1>Imperial Robotics Team 3734</h1>
we hope to participate in several community service projects and build a robot using the help of the community. We
want to bring everyone together to create something that is truly revolutionary.</p>

<h2>Mentors</h2>
<h4>David Tuck</h4>
<img src="{{ site.url }}/images/Tuck.jpg" alt="Team">
<p>
As the official sponsor for the team I act mainly as a facilitator for the team. I have no formal training and little skill in STEM
fields, but I have always enjoyed working with students who do. The coaches are more than competent to handle the technical aspects
of the building and programming. I do provide the occasional suggestion, but I see my primary role as helping the various parts of
the team work together. The builders, programmers and drivers all need to coordinate and I try to facilitate communication among them.
While I may not understand everything they are doing, I find the time I spend with the robotics team both fascinating and rewarding.
A latin teacher by day and robotics engineer by night, working with FTC has been a privilege and an honor.
</p>
<h2>Mentor</h2>

<h4>Karim Virani</h4>
<img src="https://lh3.googleusercontent.com/-JlvLnOLWc-0/TxBIFnWitBI/AAAAAAAABNg/PZlfagw-aHYSGk10w3XV4rkPNxhCaNFDgCEw/w136-h140-p/papa.jpg" alt="Karim Virani Photo">
@@ -37,29 +27,6 @@ <h4>Karim Virani</h4>

<h2>Team Members:</h2>

<h3>Captain:</h3>
<h4>Austin Davis</h4>
<img src="{{ site.url }}/images/blog photo.png" alt="Team">
<p>
Hey I'm Austin, captain of FTC team 3734 Imperial Robotics, and currently a junior at the Science and Engineering magnet at Townview
Magnet Center. I've been participating in both FTC and FRC robotics since the 7th grade and have taken all of my past experiences from
various roles on teams to shape the way I lead 3734, with focus on individual involvement and learning. I joined robotics in order
to expand my knowledge of materials, mechanical engineering, and their applications in modern life, all of which started from my love
of chemistry and physics.
</p>



<h3>Developers:</h3>

<h4>Lead: Abhijit Bhattaru</h4>
<img src="{{ site.url }}/images/Abhi.PNG" alt="Team">
<p>
Hi! My name is Abhi Bhattaru. I go to the Science and Engineering Magnet at Townview and I am currently in 10th grade. Being the lead
developer, I work closely with managing this blog and its inner workings. I do my best to document all meetings as well as any special
events that our team participates in. I joined robotics due my fascination with math and science and its incredible applications
in current situations in the world.
</p>

<h5>Michael Sharp</h5>
<img src="{{ site.url }}/images/Michael.png" alt="Team">
@@ -68,20 +35,7 @@ <h5>Michael Sharp</h5>
I joined Robotics because I simply thought it would be an interesting experience.
</p>

<h5>Owen Fitzgerald</h5>
<img src="{{ site.url }}/images/owen.jpg" alt="Team">
<p>
Greetings, my name is Owen Fitzgerald, and I am a Sophomore at the School of Science and Engineering at Townview.
I assist in planning and brainstorming the construction of the robot and helping out whenever someone else needs an extra hand.
I joined Imperial Robotics because I always had interest in robotics, but I wanted to contribute despite lack of experience.
</p>




<h3>Programers:</h3>

<h4>Project lead: Rohit Shankar</h4>
<h4>Rohit Shankar</h4>
<img src="{{ site.url }}/images/rohit.PNG" alt="Team">
<p>
I am a programmer for imperial robotics. I am currently a sophomore at the School of Science and Engineering at Townview Magnet Center.
@@ -120,22 +74,6 @@ <h5>Britney Ramirez</h5>
and math and applying it to real-world usage.
</p>




<h3>Build Team:</h3>

<h4>Build Lead:Charlotte Leakey</h4>
<img src="{{ site.url }}/images/Snapchat-54770588.jpg" alt="Team">
<p>
Hi! I'm Charlotte Leakey, and I am a sophomore at the School of Science and Engineering. In 3734, I spend most of my time
building the robot so that it can complete its missions with efficiency. I've been participating in robotics since the 7th grade, and I
really enjoy participating due to my love of physics and engineering.
<!-- Insert information about yourself. This information needs to include you name, school, grade, explain role on the team, explain
interest in math/science/robotics. Once you do this, upload a picture of urself and upload it to this document. An example
of how to do this can be seen by looking at Abhi's post-->
</p>

<h5>Christian "Shaggy" Saldaña</h5>
<img src="{{ site.url }}/images/Shaggy.jpg" alt="Team">
<p>
@@ -147,10 +85,4 @@ <h5>Christian "Shaggy" Saldaña</h5>
of how to do this can be seen by looking at Abhi's post-->
</p>

<h5>Brandon Alba</h5>
<img src="{{ site.url }}/images/Brandon.jpg" alt="Team">
<p>
Helo, my name is Brandon De Alba, I am a junior at the School of Science and Engineering, and I have been part of the Imperial Robotics
team since my sophomore year. This year I helped create the original blueprint for our launching mechaism and I helped build and made sure
that the robot worked properly.
</p>