Twitter branch Merge

Ready for week 9