new features and design
Merge branch 'master' of https://github.com/zenynunez/ocupateYa