re added laziness
Merge pull request #3 from goddardmorse/src

Delete src branch after merge
Cleaned up imports
Merge pull request #4 from goddardmorse/dev

Moving to src branch