current bdd empty
	modifié:         app/super_robots.sql
Merge branch 'master' of https://github.com/arsendeau/super-robots

Conflicts:
	app/super_robots.sql

	supprimé:        app/super_robots.sql