mailer
fix conflict
datepicker
Now there is a cool little plane animation
Merge branch 'master' of github.com:antoinemenini/LaunchHack into design

Conflicts:
	.DS_Store