add route at export_appointment/:id to download as ical file
Merge pull request #2 from veronicacannon/export-ical

add route at export_appointment/:id to download as ical file
Add user model and authentication to all pages except new
Merge pull request #6 from veronicacannon/admin_auth

Add user model and authentication to all pages except new
Add validation for 10-digit phone and email
Add missing controller files for admin auth.
Correct file formatting
Clean up older code
Merge pull request #7 from veronicacannon/validation

Validation: regex for phone and email
Merge pull request #8 from veronicacannon/admin_auth

Add missing controller files for admin auth.
Stylesheets + Logo

Updated CSS stylesheets and added a logo to the New Appointment page.
Merge pull request #9 from veronicacannon/css

Stylesheets + Logo
Closes #10: changed default webpage to appointments#new
add Service Table and Validation for time limits on Services
closes #13 edited text on new appointment page
Merge remote-tracking branch 'origin/service_table'
Included both default route and new services table route
Conflicts:
	Website/config/routes.rb
small update
local lock
merge