edit signup et base
Merge branch 'master' of https://github.com/Tuxii/pixie

Conflicts:
	pixie.sql
edit signup