Added pong
Merge branch 'master' of github.com:hbradlow/timeuser
pong failuer
Merge branch 'master' of github.com:hbradlow/timeuser

Conflicts:
	harness/activate.js
	manifest.json
Merge branch 'master' of github.com:hbradlow/timeuser
Trying to get on page thing to work