updated life-tracker
Merge branch 'master' of https://github.com/tiy-durham-2014-09/life_tracker