Resolving conflicts
Merge pull request #9 from sjafri5/adding-ass-tests

Resolving conflicts