took out duplicates
pulling
fixed conflicts
pulling
added filter, styled husk user
Merge pull request #54 from mwdion/master

changed headers on users/chicagos/mccradys/minero
finished styling husk user page
Merge pull request #53 from lapty/master

added filter, styled husk user
added CRUD to menu items
added CRUD to menu items
Merge pull request #55 from wgallop99/master

added CRUD to Menu Items
merge
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team6
styled admin page
deleted unnecessary folders, styled main page, removed admin link for users, styled devise pages
Merge pull request #56 from lapty/master

styled admin page
added edit item
fixed conflicts and fixed update bug
Merge pull request #57 from wgallop99/master

fixed update bug
added redirect to admin pages after sign in