too many changes... sorry

Signed-off-by: Andrew Pinzler <pinzler@gmail.com>
Merge branch 'master' of https://github.com/HacktheUniverse/doctor-carl