Merge branch 'master' of github.com:alanlee35/reliable_rents
fixed db
Merge branch 'change2'
Merge branch 'master' of github.com:alanlee35/reliable_rents
Finished admin controller and routes, fixed navbar to appropriate privelages
Merge branch 'master' of github.com:alanlee35/reliable_rents
fixed merge conflicts