Merge pull request #39 from jereln/styling

Styling
allowing clients to pick a time
Merge pull request #41 from jereln/fix_tests

Fix tests
fixing merge conflicts
add cancelled_id to appointments