added in my name and affiliation
Merge remote-tracking branch 'wafels/master'
Added affiliation
Merge pull request #45 from ayshih/master

Affiliations