this is a test
Added tile map text file loading
Merge branch 'develop' of https://github.com/gmansilla/comp231 into develop