Version Final
Merge branch 'master' of github.com:ozgarza/GAlaDos