Added some stuff.
added another line

-It was pretty fun.
Merge branch 'refs/heads/kevin-local'

Conflicts:
	treehouse.txt