[sompop] added sample screensaver stuff
test
test
test
test
test
test
test
test
test
test
add article navigation dummy
Puzzle Changes
Merge branch 'development' of github.com:CS-Worcester/CS401Spring2013 into puzzle

Conflicts:
	.DS_Store
Deleted .DS_Store files, which we don't need.
[sompop] clean up files before commit
[sompop] added script to index.html to go to screensaver after 1 min idle, and Joe made some fixes to the index.html
Merge pull request #9 from CS-Worcester/sompop

Sompop
changing settings to tims specs
update article to reflect tims new specs