Merge pull request #1 from EmilWestergren/master

Added Dictionary class
Fixed tabs, typos, and added breaking tests. Dictionary does not handle Covers.
Accidentally created a Cover that was actually a Class. Fixed.
Added merge test.
Fixed cover usage and merge function