drone.io continuous delivery done
Merge branch 'master' of github.com:greyna/kiss_game

Conflicts:
	drone.io