FINAL 2
Added Challenge3 files
Fixed challenge2 merge stuff