committing from terminal
Merge branch 'master' of github.com:nmaknarakham/test