Merge pull request #11 from elizabethm2014/master

new pull
added server
added server.py
changed to bottle
Merge remote-tracking branch 'upstream/master'