Merge pull request #141 from COPPER-BOBCAT/staging

Merge conflict resolution
Merge pull request #142 from RTakes/conflictRes

Fixed admin conflict issue
Merge pull request #145 from COPPER-BOBCAT/staging

Staging
modularizing routes
deleted unneeded files
commented out console.log
Merge pull request #146 from power9/master

modularization