changed index to provide solutions or not plus added tests for both
resolving merge conflicts
resloved merge conflict
Merge pull request #6 from acltc/solutions_or_not_plus_tests

changed index to provide solutions or not plus added tests for both