My first post to the web page.
Added myself to student list
Fix conflict with sandra and me - roberta
Fixed conflict with sandra
Merge pull request #22 from bertaBoulder/master

Fixed a conflict with sandra, also fixed her zip