first iteration rough draft code
Merge branch 'master' of https://github.com/ketanjoshi/ooad

Try merge