first commit
merge conflict errors
update schema
resolve merge conflict
added categories controller and associated views
Merge pull request #7 from jgkingston/master

Added categories controller and controller view files