Added Houston data exercises
updated slides for sessions 6 and 7
fix merge conflict