To merge with master.
Merge branch 'master' of https://github.com/howardxu/game_of_life

Conflicts:
	src/Map.cpp
	src/Map.hpp
	src/Map.txt
Still parser...

Now handling branch.
Finish Map.

Use ID for each square and store link info in map file.