First commit of Fall Quarter
Merge origin/master