Unknown change
Abandoned local change
K
Merge branch 'master' of https://github.com/spaceconcordia/space-lib
Merge branch 'master' of https://github.com/spaceconcordia/space-lib
Merge branch 'master' of https://github.com/spaceconcordia/space-lib
Merge branch 'master' of https://github.com/spaceconcordia/space-lib

Conflicts:
	shakespeare/src/shakespeare.cpp
Clean up make file and includes