minor edits
Merge pull request #49 from benmarwick/master

a bit of progress on the intro...
updated contributors
spacing icons
more spacing
trimmed AED
Merge pull request #50 from jhollist/gh-pages

Added myself to contribs.
fixed typo
added minor branch part
changed upstream to master
fixed merge conflict in contributors section
fixed merge conflict in contributors section
added ben and add contributor section to collaboration guide.
Merge pull request #51 from iamciera/gh-pages

Collaborators Guide
collaboration guide link on main page
Merge pull request #52 from iamciera/gh-pages

collaboration guide link on main page
fixed coding sytax conversion
fixed coding sytax conversion
Merge pull request #53 from iamciera/gh-pages

fixed code indenting conversion problem
cahnge font