merging master
adding api/users controller and d3 styling on user#index