Hostile takeover!!
Merge branch 'master' of https://github.com/githubteacher/foundations

Conflicts:
	Tom.txt
Merge branch 'master' of https://github.com/githubteacher/foundations