new version
Merge branch 'master' of http://github.com/cdparra/reminiscens-explorelife