json syntax can go DIAF
Merge pull request #3 from groovecoder/fix-json

json syntax can go DIAF
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	attendees.json
Merge pull request #4 from groovecoder/gh-pages

add Abigail and fix merge conflict
Update attendees.json

Added Abigail LaBounty's twitter and github sccounts
added me to attendees
I'm adding my name to the list!
Merge pull request #5 from minkcv/master

added will smith to attendees
Merge pull request #6 from alabount/master

Update attendees.json
Merge pull request #8 from cjf590/master

I'm adding my name to the list!
clean up json syntax