Commit before merging local changes
Merge branch 'master' of github.com:rshk/ardomino-api

Conflicts:
	local_settings.example.py