changes

yo
Merge branch 'master' of https://github.com/krstlb/timewhale

Conflicts:
	TEST/hiii everyone this is sean.txt
Merge branch 'master' of https://github.com/krstlb/timewhale