Added Doxyfile and commented classes with to generate .html for class documentation
Added comments to the business logic
Resolve conflicts when pulling from master