Deleted .idea/workspace.xml
Merge branch 'jeff' of github.com:MiguelABarbosa/comics into mike
Merge branch 'develop' of github.com:MiguelABarbosa/comics into mike
merge commit
merge conflict resolved
Merge pull request #7 from MiguelABarbosa/mike

Mike
cleaned up tests for continuous development
Merge branch 'develop' of github.com:MiguelABarbosa/comics into mike
passes all tests
Merge pull request #8 from MiguelABarbosa/mike

Mike
testing now at 97%
Merge pull request #9 from MiguelABarbosa/mike

testing now at 97%