changes made at ubutu
Merge branch 'master' of github.com:mrana88/gitdemo into demo2