added sales view and template
changed sales view and template
removed unnecessary folder
Merged with master
updated with blake's changes on master
More merge conflicts
Merge branch 'saleschart'
Merge pull request #2 from BlakeLawson/marco_changes

Marco changes. Seems good?