Appli rails
Merge branch 'master' of github.com:slash4/scp

Conflicts:
	.gitignore