Merge pull request #10 from CS-Worcester/sompop

Sompop
Added ability to do 3 puzzles and new user interface look.
New layout and buttons
Merge branch 'development' into puzzle

Conflicts:
	puzzle/.DS_Store
	puzzle/utilities/.DS_Store
Button Layout for Kiosk Pro
Button Location Change
Merge pull request #14 from CS-Worcester/puzzle

Puzzle
[sompop] new screensaver page using jquery mobile instead of jquery plug-in, and fix bug in IntroPage.html
Merge branch 'development' of https://github.com/CS-Worcester/CS401Spring2013 into sompop