Merge pull request #2 from ekt7be/master

changed spawning to wave-style and stop repeated 2d texture loading
skill tree, minor bug fixes with tile collision
merged seans changes
fixed build problem updated gitignore
fixed bullet collision problem
Merge branch 'stevesbranch'
added reading texts into maps
added maptxt
merged with upstream