initial commit
 - reformatted code
 - started creating test classes
 - removed methods
 - added unit tests
 - formatted the pom file
 - reformatted code
Merge branch 'maven' into development

Conflicts:
	.gitignore