big changes, let the game begin.
Merge resolution.

Merge branch 'master' of https://github.com/nosnhojn/agile-codev-platform

Conflicts:
	sw/game-of-life/src/DisplayXil.cpp