removed unused template helpers from mybids
Merge branch 'master' of https://github.com/busheldirect/initial
Further work on bids and countering
Merge branch 'master' of https://github.com/busheldirect/initial

Conflicts:
	client/main.css