modif lagi
modif
modif dikit
modif dikit lagi
tambah pagination
tambah pagination
Merge branch 'master' of https://git.heroku.com/floating-refuge-7268

Conflicts:
	staticfiles/css/mystyle.css
perbaikan