Make splash with view :D
Merge branch 'splash' into develop
Make map :D
Detected collisions
Merge branch 'splash' into develop