[sompop] updated Screensaver and added IntroPage
Merge branch 'development' of https://github.com/CS-Worcester/CS401Spring2013 into sompop
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
Merge branch 'development' of github.com:CS-Worcester/CS401Spring2013 into user_interface
update puzzle