egyik Board
Merge branch 'feature/20140407' of https://github.com/geryxyz/softdev2014spring into feature/20140407

Conflicts:
	GameOfLife/GameOfLife/GameOfLife.vcxproj