Some notes

The previous merge is totally a mistake... Never do it.
The master branch in github should map to _deploy