clear unwanted words
Merge branch 'master' of https://github.com/bryan0806/106B-CPP

Conflicts:
	Life/Life.pro.user
	Life/src/life.cpp