Added bottle, fixed api.py
Merge pull request #7 from concreted/master

Added bottle, fixed api.py