0.1 -- Aug 15,2014

* Initial release
Conflict resolution version 0.1