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.

Sign up for GitHub

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

Jump to bottom

Added Zodiac Signs and Spirit animals #46

Closed
wants to merge 16 commits into from
Closed

Added Zodiac Signs and Spirit animals #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e76eaba
Changed MStaehlings merge conflict
May 18, 2015
da81b74
Updating forked student-roster...
melrodbos May 18, 2015
eaaa817
Merge pull request #3 from TheIronYard--Orlando/master
melrodbos May 19, 2015
975b535
Updated sports section
melrodbos May 19, 2015
cf46713
Updating drinks
melrodbos May 19, 2015
386ae9d
Delete melrodbos.md
melrodbos May 19, 2015
675f5d5
Update pope410211.md
melrodbos May 19, 2015
b64b225
Updating @pope410211
melrodbos May 19, 2015
6682e6f
Update sjoyal.md
melrodbos May 20, 2015
f5b5f73
Update jorgehjr84.md
melrodbos May 20, 2015
fed57b3
Update kmattiko.md
melrodbos May 20, 2015
2104277
Update MStaehling.md
melrodbos May 20, 2015
ebbfde8
Update JessyRiordan.md
melrodbos May 20, 2015
00dc052
Updated everyones zodiac and spirit animal
May 20, 2015
db8ee6d
Fixed the merge conflicts between me and Melissas student roster file
May 21, 2015
8d82f90
Added new category
May 26, 2015
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
18 changes: 10 additions & 8 deletions 2015-05/FEE/Epicurean306.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | --- |
| _drink_ | :beer: :wine_glass: |
| _food_ | --- |
| _movie_ | --- |
| _sport_ | :sailing: |
| _team_ | apathetic :godmode: |
| _drink_ | :beer: :wine_glass: :coffee: :tea: |
| _food_ | :sushi: :meat_on_bone |
| _movie_ | Dai-bosatsu tôge |



## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | classical:taurus:, sidereal:aries: |
| _spirit animal_ | :dragon_face: |
| _celeb birthday_ | Robert Oppenheimer :bomb: |
6 changes: 3 additions & 3 deletions 2015-05/FEE/JessyRiordan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | Gemini |
| _spirit animal_ | Tiger |
| _celeb birthday_ | Prince(June 7th) |
5 changes: 2 additions & 3 deletions 2015-05/FEE/MStaehling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
| category | value |
|-----------|-------|
| _:house:_ | Virginia Beach, VA |

| _:dog: or :cat:_ | :dog: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :tv: :: etc |
| _team_ | --- |
i| _team_ | --- |
| _drink_ | :beer: :wine_glass: |
| _food_ | --- |
| _movie_ | --- |
| _movie_ | "Troy" |

## Esoteric :crystal_ball:

Expand Down
6 changes: 3 additions & 3 deletions 2015-05/FEE/gatorpazz.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | Virgo |
| _spirit animal_ | Cat |
| _celeb birthday_ | Roman Emperor Caligula |
6 changes: 3 additions & 3 deletions 2015-05/FEE/jorgehjr84.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | :gemini: |
| _spirit animal_ | **deer** |
| _celeb birthday_ | **Naomi Campbell** |
12 changes: 6 additions & 6 deletions 2015-05/FEE/kmattiko.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | --- |
| _sport_ | :football: |
| _team_ | Browns |
| _drink_ | :beer: :wine_glass: |
| _food_ | --- |
| _food_ | :Eggplant: |

| _movie_ | --- |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | :libra: |
| _spirit animal_ | :wolf: |
6 changes: 3 additions & 3 deletions 2015-05/FEE/melrodbos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | Aries |
| _spirit animal_ | Hawk |
| _celeb birthday_ | Lady Gaga |
6 changes: 3 additions & 3 deletions 2015-05/FEE/pcreglow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | Sagittarius |
| _spirit animal_ | Deer |
| _celeb birthday_ | Bill Nye |
2 changes: 1 addition & 1 deletion 2015-05/FEE/pope410211.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _spirit animal_ | :bird: |
| _celeb birthday_ | --- |
7 changes: 4 additions & 3 deletions 2015-05/FEE/sjoyal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
| _zodiac_ | Gemini |
| _spirit animal_ | :crocodile: |
| _celeb birthday_ | Wynona Judd |
| _zodiac_ | :gemini: |
5 changes: 5 additions & 0 deletions 2015-05/TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |


## Apple Fanboy/girl

| :iphone: | y/n |