Update ??
Merge branch 'master' of https://github.com/chaninz/bandbrary

Conflicts:
	application/views/editProfile.html
	application/views/editProfile.php