added lives, still not working thou
Merge branch 'dev_AO' into dev