inital commit
Adding source files
Adding javadocs
Adding a runnable .jar
Adding .gitignore
Resolving conflict
Merging to resolve conflict