minor changes to the intro text
Merge branch 'feature/issue/#18_Backstory' into develop
bump version to 0.6.5
Merge branch 'release/v0.6.5'
Merge branch 'release/v0.6.5' into develop
Added Julian, mentioned that Meral did the music
Merge branch 'hotfix/Julian_in_credits'
Merge branch 'hotfix/Julian_in_credits' into develop
putting this here in lieu of a stash
ignore some temporary files/folder
more ignoring
Merge commit 'bc79a774087aa0b89023fa8ff5fdb08289fdf5ee' into develop
more ignoring
Update README.md
creep spawning is now defined in waves in the mission.inis; each wave creates new spawn points, these could in theory be at any position on the map; a delay at the beginning of each wave is set in the mission.ini but is not yet implemented.
Rebalancing the game will be necessary now as later waves can easily be fought off with the infrastructure built during the first wave.
ignore some moar
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge branch 'develop' into origin/feature/issue/#63
missing commas
slightly modified difficulty setting