added name to list
fixed conflicts
Merge pull request #3 from adamggg/adam

added name to list