squash of three commits

* testing branch for pull request
* add a file for editing
* fixed line order
Merge pull request #2 from benolee/test-branch-for-pull-request

squash of three commits