committing before pull
fixed merge errors
pulling changes
removing Makefile from commit
adding code to build terrain from a heightmap
merge problems
something