Merge branch 'master' into sambox
Merge pull request #56 from lukemesiti/sambox

Improved profile page look ----awesome
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!
Merge branch 'master' into directory