first working prototype
Merge pull request #3 from caryanne/master

first working prototype