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