Resolving merge conflicts
Merge branch 'master' of https://github.com/avinashpujala/Wavelet_Avinash
Minor changes
Merge branch 'master' of https://github.com/avinashpujala/Wavelet
Merge branch 'master' of https://github.com/avinashpujala/Wavelet
Renamed: createdatastructure --> CreateDataStruct