Started work on simplifying code.
Merge branch 'master' of https://github.com/BCAMart/BCAMart-Website