played around with index page
index page
Merge branch 'master' of https://github.com/hassanjalilk/Final-Project

Conflicts:
	app/views/categories/index.html.erb
finally fixed categories
Merge branch 'master' of https://github.com/hassanjalilk/Final-Project