show album image
Merge branch 'master' of https://github.com/gswetha/cs2102

Conflicts:
	application/controllers/albumController.php
	application/models/album_model.php