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

New info about Phil and Melissa #68

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+38 −11
Open

New info about Phil and Melissa #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73b99ce
Fixing merge conflicts YAY
MStaehling May 18, 2015
0b70b72
Merge pull request #5 from MStaehling/TheIronYard--Orlando-master
MStaehling May 18, 2015
d49eb10
fix conflicts
MStaehling May 19, 2015
9a42b31
Merge pull request #8 from TheIronYard--Orlando/master
MStaehling May 28, 2015
b6aaca5
answered the esoteric for Phil
MStaehling May 28, 2015
02fe154
Update MStaehling.md
MStaehling May 28, 2015
d26dae5
changes to Melissa
MStaehling May 29, 2015
136c717
last couple questions about Melissa
MStaehling May 29, 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
7 changes: 3 additions & 4 deletions 2015-05/FEE/JessyRiordan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
## Faves! :v:
| category | value |
|----------|--------|
| _sport_ | :swimming: :football: :basketball: etc. |
>>>>>>> TheIronYard--Orlando-master
| _sport_ | :swimming: |
| _team_ | Washington Capitals |
| _drink_ | :beer: :gin: :tonic: :wine_glass: |
| _food_ |:chocolate: |
| _drink_ | :beer: :gin: :tonic: |
| _food_ | Chocolate |
| _movie_ | --- |

## Esoteric :crystal_ball:
Expand Down
1 change: 0 additions & 1 deletion 2015-05/FEE/MStaehling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
| category | value |
|-----------|-------|
| _:house:_ | Virginia Beach, VA |

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

## Faves! :v:
Expand Down
35 changes: 32 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 @@ -6,16 +6,20 @@
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |
| _:birthday:_ | _March 28_ |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | --- |
| _team_ | --- |
| _sport_ | _:soccer:_ |
| _team_ | _Barca_ |
| _drink_ | N/A -- We are made of water. |
| _food_ | Answer D: All of the above |
| _movie_ | --- |
| _movie_ | _Amelie_ |
| _book_ | _100 Years of Solitude_ |
| _travel_ | _Puerto Rico & Barcelona, Spain_ |
| _craft_ | _painting_ |

## Esoteric :crystal_ball:

Expand All @@ -24,3 +28,28 @@
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |

## Apple Fanboy/Fangirl??
| :iphone: | _Yes_ |

## Theme Parks!
| category | value |
|----------|--------|
| _:ferris_wheel: or :roller_coaster:_ | _No, thank you_ |
| _:monorail: or :bus:_ | _:monorail:_ |
| _:poultry_leg: or :hamburger:_ | _:hamburger:_ |
| _:mouse: or :earth_americas:_| _:earth_americas:_ |

## Fashion Style :bowtie:
+
+| category | value |
+|----------|-------|
+| _hat_ | _headband_ |
+| _clothing_ | _:jeans:_ |
+| _shoes_ | _trainers_ |

## Randomness

| category | value |
|-----------------|------------------------------|
| _:hand:-edness_ | :point_right: |
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 |