fixed merge conflicts
fixed merge conflicts
Merge branch 'master' of github.com:ftwgroup/thefoundersmarket