Initializing middleman blog
Blog Text
Update team.yml

added my name to team list
Updating per current events
Not pushing this intentionally
Fixing link in jumbotron
Merge branch 'master' into blog

Conflicts:
	Gemfile
	Gemfile.lock
	config.rb
	source/_footer.html.erb
Merge pull request #38 from atomparker/patch-1

Adds Adam Parker to team members
Blog layout appears to work, contains initial blog post
Merge branch 'master' of https://github.com/CodeForCharlotte/codeforcharlotte.org
Adds Michael to the team roster

Conflicts:
	data/team.yml
Moving blog to footer for now, struggling looks-wise
Removing sample blog, since we have a real one
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