This should be difference from pc and mac
Merge branch 'master' of https://github.com/bryan0806/106B-CPP

Conflicts:
	Life/Life.pro.user

not sure why would happen may come from pc and mac
finish this Map warm up function using 2011 stanford lib