Merge pull request #20 from SixtusTheFifth/master

Fix of stupid 'conflicts detected' message when there are no conflicts
larvaANDdefaults
allfiles
Sunday Defaults
allfiles
HotS Multiplayer Defaults
Observer Keys, CGs, and Cameras
All Files Added
Updated readme to reflect latest changes
removed unused keys
banished hidden conflicts on campaign Ultra and Swarm Host
removed unneeded checks
fixed Scourge conflict
generated layouts