filtering blocks and parts added
Merge branch 'gh-pages' of https://github.com/symaxian/SeniorDesign into gh-pages
Merge branch 'gh-pages' of https://github.com/symaxian/SeniorDesign into gh-pages
fixed merge