Removed .idea
Merge https://github.com/lizzehface/WinterEvent
Update README.md
Merge https://github.com/lizzehface/WinterEvent
Merge branch 'master' of https://github.com/DonoA/WinterEvent

Conflicts:
	README.md
Merge pull request #1 from DonoA/master

Fixes