modulirize code some more
rename main method
better param order
return stuff
merge tool
bug fixes
fixes #13
Merge pull request #16 from calvinmetcalf/mergable-files

Mergable files