Merge branch 'master' into directory
started styling articels form
Merge branch 'master' into styles-tonight
pundit, documents
- added pundit restrictions to documents
articlesstyling part 2
Merge pull request #57 from lukemesiti/lukeDevel

pundit, documents
Merge branch 'master' into styles-tonight
article styling, show, new, index and edit page also hard coded the user in the form
td and tr styles
Merge pull request #58 from lukemesiti/styles-tonight

looks good!
added directory page, route, and updated link in header to suit
Merge branch 'master' into directory
Merge pull request #59 from lukemesiti/directory

all good :)
added admin control panel, routes and updated header
Merge pull request #60 from lukemesiti/adminstuff

added admin control panel, routes and updated header
fixed conflict with nav bar