Control
merge

Conflicts:
app/views/index.blade.php
index

asdasd