change timing of picture.js from 20 secs to 8 seconds.
Change rickroll source.
require timeout variable for cleartimeout() callback.
merge rickroll and picture timing update
Merge branch 'shorten_picture_time' of https://github.com/tleung999/simplicity
Merge with master to shorten picture timing
change timing for tag canvas.
Merge branch 'tag_canvas_timing' of https://github.com/tleung999/simplicity
merge tag canvas timing
Merge pull request #72 from tleung999/thursday_merge

Thursday merge to fix timing issues