Merge with something that changed nothing
Merge branch 'master' of https://github.com/quinston/summative2013
decreasePopulation method in Lifeform, put it into suicide, no more double decrements