Cleaned up versions of challenge1 and challenge2

This is a new pull request with modified versions of challenge1 and challenge2.