Merge branch 'master' of https://github.com/abhandaru/gpu-seamcarving
Merge branch 'master' of https://github.com/abhandaru/gpu-seamcarving
Fixed energies and style.