Feature complete
Merge branch 'master' of https://github.com/anotherlab/thedoctors.git