squash of three commits

* testing branch for pull request
* add a file for editing
* fixed line order

closes #1