time update
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	cache.appcache
update date
Merge remote-tracking branch 'origin/master' into gh-pages
cache time update
delay update
Merge pull request #1 from kingjiv/gh-pages

delay update
parameters weren't being used
Merge branch 'master' of https://github.com/kingjiv/2048