removed files"
Ad"
readme update
Ad"
merge conflict
Merge pull request #7 from buren/bugfix

Bugfix
resolved merge
resolved merge
Merge pull request #9 from buren/master

Merge