Merge pull request #5 from shawntabai/master

Merge pull request #4 from shawntabai/coleen
Added Lombok and other modules
Merge pull request #7 from shawntabai/coleen

Coleen