Update master
another update
fixing
Merge branch 'firstBranch'

Conflicts resolved:
	src/ken/Main.java
	src/ken2/Television.java
Added sleepTime var
Update sleepTime
Merge branch 'firstBranch'

Conflicts:
	src/ken2/Television.java
Merge branch 'master' into firstBranch

Conflicts:
	src/ken/Main.java