add model, routes
fix merge conflict
modify routes, add views