posting of problems/solution. still need to allow answer
Merge branch 'master' of https://github.com/madthad91/tSolutions

Conflicts:
	www/templates/search-results.html