Compare commits

...
Resolved merge conflicts. #17
View Pull Request