Problem 3 Progfest 2011
Create Problem 1
Merge pull request #3 from terabytes/master

Problem 1 and 3