initial commit still trying to figure out TDD
Merged changes
removed .idea/ folder