Initial Commit
Basic movement and sprite loading working
Fixed conflict