Submission of Challenge 1&2

Very interesting problems. Thanks.
Merge pull request #33 from wangg/challenge1&2/wang

Thank you very much for your submission and hard work! Well done! 
We will review it and get back to you shortly!