Creating template
Merge branch 'master' of https://github.com/CakeFuelled/timeshift

Conflicts:
	README.md