adding categories to schema
added sign-up validations
resolved conflicts from adding sign-up validations
homepage complete
Merge branch 'master' of https://github.com/marquesjordan/gotjokes
homepage mock-up complete