nitial commit
Merge branch 'master' of https://github.com/ajefferson/tardis

Conflicts:
	README.md