Data table generation done
Conflict resolved
Merge branch 'master' of github.com:pykih/salestag