Resolving duplicate header file import
Updating old shakespeare header file
Merge branch 'master' of https://github.com/spaceconcordia/watch-puppy

Conflicts:
	inc/shakespeare.h