intro to git and room numbers
merge