add Abigail
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