Clean up
Merge branch 'master' of https://github.com/khanna7/Development

clean up