Added api
Merge branch 'master' of https://github.com/jhd/spunout

Conflicts:
	databaseConnector.py