maven, resolved errors, etc
refactor
refactor
Merge pull request #1 from fluxtah/master

Initial