Created repository
Merged latest changes
Removed old merge file
Added missing main invocation on some modules
Replicated changes from GIT repository
Merged code from development branch. Django actions (shopping list and inventory) reorganized and put in separate modules-
Removed sample content
Merge branch 'master' of ssh://github.com/ccdesales/programs