added controllers, still need routes
added accept/decline controllers back in
added routes
change format of views folders so that it matches the controllers
more merging