heyhey
Merge branch 'master' of https://github.com/rainaz/buydo
bidTest01
Merge branch 'master' of https://github.com/rainaz/buydo

Conflicts:
	application/models/item_model.php
bidItem02
Merge branch 'master' of https://github.com/rainaz/buydo
bidbidbid
Merge branch 'master' of https://github.com/rainaz/buydo

Conflicts:
	application/controllers/item.php
Merge branch 'master' of https://github.com/rainaz/buydo