PyPi setup files
Merge branch 'master' of github.com:nikoladimitroff/adder

I don't really know why a merge was necessary