Changed 4A exercises to remove E2 and E3, add a sub-exercise of E1, and fix ambiguities in E1
fixed merge conflict in 4A
Merge branch 'master' of https://github.com/iExperience/iExperience.github.io

Fixed merge conflicts in exercise 4A