Added 5 refactored easy challenges
Fixed conflict