Adding new files
Merge branch 'master' of ssh://github.com/jdgdeveloper/base