Done filtering products header
Merging our files
Merge branch 'master' of github.com:vqdo/cse135