Update team.yml

added my name to team list
Fixes a problem where email addresses that were null were causing the page build to fail. Also corrects layout errors caused when no email address was present

I wasn't checking that email.blank? before handing the email to the md5 of gravatar generation. So I had to check for both nil and empty strings. Once I had some users who preferred not to add an email address and rolled through the whole array I found that layouts were janky. Specifically 6 column entries with no image didn't take the full 6 columns so they'd collapse and the effect was a jumble of names than nice columns of team members. Now the team members are sorted by email address first, so they are printed in nice 6 column fields then fill in with everybody else. If that looks terrible as more team members add themselves we'll fix it then.
Merge pull request #40 from scottelundgren/team_members_sorted_by_email

Fixes a problem where email addresses that were null were causing the pa...
Moved Michael's addition of himself down a row so it does not conflict with Tom
Merge branch 'MichaelWaltuch-patch-1'

Adds Michael to the team
Merge pull request #38 from atomparker/patch-1

Adds Adam Parker to team members
Merge branch 'master' of https://github.com/CodeForCharlotte/codeforcharlotte.org
Adds Michael to the team roster

Conflicts:
	data/team.yml
Attempt to fix CLRF issues on build & deploy
Merge pull request #41 from scottelundgren/fix-clrf-bootstrap

Attempt to fix CLRF issues on build & deploy
Second attempt to fix CLRF issues on build & deploy
Merge pull request #42 from scottelundgren/fix-clrf-custom

Second attempt to fix CLRF issues on build & deploy
Puts Jim's updates back, that I somehow overwrote :..(
Merge pull request #43 from scottelundgren/july-homepage-updates

Puts Jim's updates back, that I somehow overwrote :..(
Adds Logical Advantage as a partner

The description of LA was taken straight from the meta description field from their homepage because a description was not provided in the email.
Merge pull request #44 from scottelundgren/logicaladvantage-as-partner

Adds Logical Advantage as a partner
Update team.yml

updated and corrected my entry
Merge pull request #47 from atomparker/patch-2

Update team.yml
Adds a media page for all media mentions, videos, and images of Code for Charlotte events

Additional since the Fellow's Tumblr page was added to media, I'm removing it from the navigation partial. I also formatted the template page for easier future cloning
Merge pull request #48 from scottelundgren/media

Adds a media page for all media mentions, videos, and images of Code for...
Merge remote-tracking branch 'upstream/master' into blog

Conflicts:
	data/team.yml
	source/index.html.erb