Merge pull request #140 from RTakes/conflictRes

Conflict res
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 #143 from RTakes/conflictRes

Fixed admin conflict issue
Merge pull request #144 from RTakes/conflictRes

fixing admin page
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
Merge pull request #147 from COPPER-BOBCAT/staging

Staging
fixed bug for auth route
Merge pull request #148 from power9/master

fixed bug in auth route
Merge pull request #149 from COPPER-BOBCAT/staging

Staging
testing authentication
Merge pull request #150 from power9/master

fixing authentication
Merge pull request #151 from COPPER-BOBCAT/staging

Staging
fixed auth bug
Merge pull request #152 from power9/master

fixed auth bug
Merge pull request #153 from COPPER-BOBCAT/staging

Staging