initial code commit, test cases not added or working yet
All tests passing.
conflicts resolved
Fixed incorrect test count
Merge pull request #2 from einhverfr/merge_back

Merge back