Solved merge bugs
Merge branch 'fourth_week_release' of https://github.com/lubm/shakespeare into fourth_week_release