update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/views/selection2.blade.php