* Finish refactor
Merge branch 'master' of https://github.com/Antidote/libzelda

Conflicts:
	src/SpriteFileReader.cpp