added locations.js to features_locations branch
added location_controller.rb file
worked on locations.js
added create action to location controller
deleted locations.js
added index action in dashboard_controller
added location constructor to location.js
added location controller
updated html forms to form_for rails forms
removed conflicts at index.html.erb