Update .gitattributes
Merge remote-tracking branch 'origin/dev'
Update instance.cfg
Merge branch 'master' of https://github.com/faceless-saint/olympus-minecraft
Merge branch 'dev'

Conflicts:
	.gitattributes
Update icon.png
Clean instance.cfg
Merge branch 'dev'
Merge branch 'master' of https://github.com/faceless-saint/olympus-minecraft
Reduce Magic Forest Frequency
Merge branch 'dev'
Update mods
Update README.md
Update instance.cfg
Update README.md

Corrected GitHub link to "faceless-saint" user rather than "faceles-saint".
Merge pull request #1 from SicariusVenom/patch-1

Update README.md
Fix README.md conflict