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

Merging update HMWK #66

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3beeaf2
Update MStaehling.md
kmattiko May 19, 2015
6dbe24e
Merge pull request #1 from kmattiko/patch-1
kmattiko May 19, 2015
b9f830a
commiting
kmattiko May 19, 2015
e7c51b4
conflict
kmattiko May 19, 2015
4ae7cf9
Merge pull request #8 from TheIronYard--Orlando/master
pope410211 May 19, 2015
faf9977
Updating information to resolve merge conflict
kmattiko May 19, 2015
54bbf14
Fixing this :poop:
pope410211 May 19, 2015
8b0b83b
still fixing this :poop:
pope410211 May 19, 2015
a4483dc
Merge branch 'TheIronYard--Orlando-master'
kmattiko May 19, 2015
fff1fc1
One day,
pope410211 May 19, 2015
a27e106
Merge pull request #2 from TheIronYard--Orlando/master
gatorpazz May 19, 2015
3039b41
added zodiac, spirit animal and celeb birthday
gatorpazz May 19, 2015
b921de5
I AM EVIL
gatorpazz May 19, 2015
102a560
Merge pull request #9 from kmattiko/master
pope410211 May 21, 2015
f5940b7
merge
pope410211 May 21, 2015
dac44e0
merge
pope410211 May 21, 2015
bc0a1cb
Merging all
pope410211 May 26, 2015
2e62598
let's see if this works
pope410211 May 26, 2015
25336ca
cleaning house
pope410211 May 26, 2015
7e04e53
trying somehting new
pope410211 May 26, 2015
9e4b9b8
Merge pull request #11 from pope410211/master
pope410211 May 26, 2015
44e500b
Merge pull request #12 from pope410211/template
pope410211 May 26, 2015
0f5fe88
Revert "Template"
pope410211 May 26, 2015
6be4ec7
Merge pull request #13 from pope410211/revert-12-template
pope410211 May 26, 2015
da03c0b
Merge pull request #14 from TheIronYard--Orlando/master
pope410211 May 29, 2015
c815c5a
update
pope410211 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
Prev Previous commit
Next Next commit
merge
  • Loading branch information
pope410211 committed May 21, 2015
commit dac44e048cdd72c7f7be66105edbd7d576cf556f
4 changes: 4 additions & 0 deletions student-roster/2015-01/FEE/al-the-x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# [David Rogers](https://github.com/al-the-x)

[![David Rogers](https://avatars3.githubusercontent.com/u/96015?v=3&s=460)](https://github.com/al-the-x)

26 changes: 26 additions & 0 deletions student-roster/2015-01/FEE/jorgehjr84.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Jorge Hernandez](https://github.com/)

![Jorge Hernandez](https://avatars1.githubusercontent.com/u/12106376?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

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

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
26 changes: 26 additions & 0 deletions student-roster/2015-01/TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Full Name](https://github.com/USERNAME)

![Full Name](URL-to-IMAGE)]

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

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

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
Binary file not shown.
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/Epicurean306.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Ben Forbes Griffith](https://github.com/Epicurean306)

![Benjamin Forbes Griffith](https://avatars3.githubusercontent.com/u/11682684?v=3&s=460)

| category | value |
|-----------|-------|
| _:house:_ | Toledo, OH |D
| _:dog: or :cat:_ | :dog: :cat: :dragon: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | :poop: |
| _drink_ | :beer: :wine_glass: |
| _food_ | :poop: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
25 changes: 25 additions & 0 deletions student-roster/2015-05/FEE/JessyRiordan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# [Jessy Riordan](https://github.com/JessyRiordan)

![Jessy Riordan](https://avatars3.githubusercontent.com/u/12103371?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Alexandria, VA |
| _:dog: or :cat:_ | :dog: :cat: |

## Faves! :v:
| category | value |
|----------|--------|
| _sport_ | :swimming: :football: :basketball: etc. |
| _team_ | Washington Capitals |
| _drink_ | :beer: :gin: :tonic: :wine_glass: |
| _food_ |:chocolate: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :gemini: |
| _spirit animal_ | :tiger: |
| _celeb birthday_ | :princess: |
27 changes: 27 additions & 0 deletions student-roster/2015-05/FEE/MStaehling.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# [Michael Staehling](https://github.com/MStaehling)

![Michael Staehling](https://avatars2.githubusercontent.com/u/7108911?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Virginia Beach, VA |

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

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :tv: :: etc |
| _team_ | :poop: |
| _drink_ | :beer: :wine_glass: |
| _food_ | :poop: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/al-the-x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [David Rogers](https://github.com/al-the-x)

![David Rogers](https://avatars3.githubusercontent.com/u/96015?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

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

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/gatorpazz.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Michael Pascuzzi](https://github.com/gatorpazz)

![Michael Pascuzzi](https://avatars0.githubusercontent.com/u/12232226?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Bradenton, Florida |
| _:dog: or :cat:_ | :cat: :smiley_cat: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | --- |
| _drink_ | :beer: :wine_glass: |
| _food_ | :sheep: |
| _movie_ | "There will be blood" |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/jorgehjr84.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Jorge Hernandez](https://github.com/jorgehjr84)

![Jorge Hernandez](https://avatars1.githubusercontent.com/u/12106376?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | The Bronx, NY |
| _:dog: or :cat:_ | :dog: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: |
| _team_ | UF Gators, NY Giants |
| _drink_ | Jameson on the rocks |
| _food_ | Chinese :rice: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/kmattiko.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Kim Mattiko](https://github.com/kmattiko)

![Kim Mattiko](https://avatars0.githubusercontent.com/u/12112294?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Akron, Ohio |
| _:dog: or :cat:_ | 1 _:dog: and 2 :cat:_ 's |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | :poop: |
| _drink_ | :beer: :wine_glass: |
| _food_ | :poop: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/melrodbos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Melissa Rodriguez](https://github.com/melrodbos)

![Melissa Rodriguez](https://avatars0.githubusercontent.com/u/12171924?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :poop: |
| _team_ | :poop: |
| _drink_ | N/A -- We are made of water. |
| _food_ | Answer D: All of the above |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/pcreglow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Phillip Creglow](https://github.com/pcreglow)

![Phillip Creglow](https://avatars0.githubusercontent.com/u/11493983?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Jackson, MI |
| _:dog: or :cat:_ | :dog: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: |
| _team_ | Cleveland Browns |
| _drink_ | :beer: :wine_glass: |
| _food_ | :poop: |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/pope410211.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Nicholas Pope](https://github.com/pope410211)

![Niholas Pope](https://avatars2.githubusercontent.com/u/12172658?v=3&s=460)]

| category | value |
|------------------|-----------------------------|
| _:house:_ | Ft. Lauderdale, FL |
| _:dog: or :cat:_ | :man: :bear: :pig: :dragon: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | Fencing |
| _team_ | :smirk: himself |
| _drink_ | :alien: :beer: |
| _food_ | all sorts, foodie |
| _movie_ | “The Gamers Dorkness Rising" |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/FEE/sjoyal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Sean Joyal](https://github.com/sjoyal)

![Sean Joyal](https://avatars3.githubusercontent.com/u/11789708?v=3&s=460)]

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

| category | value |
|----------|--------|
| _sport_ | :football: :basketball: etc |
| _team_ | :poop: |
| _drink_ | NattyLight:beer: |
| _food_ | tacos |
| _movie_ | :poop: |

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | :poop: |
| _spirit animal_ | :poop: |
| _celeb birthday_ | :poop: |
26 changes: 26 additions & 0 deletions student-roster/2015-05/ROR/bgates.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# [Brian Gates](https://github.com/bgates)

![Brian Gates](https://avatars2.githubusercontent.com/u/381787?v=3&s=460)

| category | value |
|-----------|-------|
| _:house:_ | Small Town, USA |
| _:dog: or :cat:_ | :bird: :snake: |

## Faves! :v:

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

## Esoteric :crystal_ball:

| category | value |
|----------|-------|
| _zodiac_ | --- |
| _spirit animal_ | --- |
| _celeb birthday_ | --- |
Loading