some changes
Resolved merge issues
Merge branch 'master' of https://github.com/arpitg1991/manhattanProject
Merge branch 'master' of https://github.com/arpitg1991/manhattanProject
somewhat working