Merge everything

Let the testing and deployment phase begin!