adding listings
Merge branch 'master' of https://github.com/galaxyAbstractor/ducking-octo-ninja

Conflicts:
	application/controllers/listings.php
	application/models/listings_model.php