Functionality in place
Refactor, added more tests
Finished tests, maven now creates an exec jar
Merge pull request #1 from JuanPSanchez/develop

Merge Develop branch to Master