how-to-design page added
merge conflicts fixed
Merge branch 'master' of github.com:suras/tshirt