Now spinner when loading data
Now welcome page is working with tiles
Made sure spinner is in the center of page
Now can categories items
Now can categories items
Merge branch 'master' of github.com:wahl77/WDI_Project

Conflicts:
	app/views/items/_form.haml
Can now edit a category as well
have an admin page and shoulde be able to move on
Name for categorie and item must now be present
Small changes to layout for the items form
Better layou, solved typo to prevent multiple categories to have the same name
Attempt to optimize
CanCan and more bootstrap
More layout fixes
Added CanCan
Error with about page
Some query optimzations....
Works perfectly if infinite scrolling is greater that results....
Now with some ajax
Now not displaying somthing that has two tags