added Connie Berardi
removed extra line after description
Merge pull request #28 from cameronbwhite/master

Updated officers and members for 2014
Merge branch 'add_berardi' of https://github.com/gburtonhome/acm.pdx.edu into gburtonhome-add_berardi

Conflicts:
	files/events.yaml
Merge pull request #29 from cameronbwhite/gburtonhome-add_berardi

Gburtonhome - add berardi
Modified index page

Added line encouraging interested members to join parent organization, and also gave a big thank you to all who came to Bitcoin event.
Updated embedded page

Added partial list of items available for events.
Update embedded.html
changed Cara to May 23. Added Sean Walsh
Update embedded.html
Merge pull request #31 from gburtonhome/events_update

changed Cara to May 23. Added Sean Walsh