By Akash
Merge branch 'master' of http://github.com/jrambasana/SCMProject2