Removed carousel directives from app.js.
Fixed major conflicts, adding admin to master
Merge pull request #210 from RTakes/conflictRes2

Fixing merge conflicts, adding admin
Removed carousel directives from app.js.
Fleshed out project readme.
More edits to readme, created a contributing file.
Merge branch 'master' of https://github.com/bernardchu/COPPER-BOBCAT
Merge pull request #211 from bernardchu/master

README and CONTRIBUTING