Added watchTV method
Merge branch 'master' into firstBranch

Conflicts:
	src/ken/Main.java
update with a loop
Merge branch 'firstBranch'

Conflicts resolved:
	src/ken/Main.java
	src/ken2/Television.java