Some changes
Merge branch 'master' of github.com:cdiener/udacity
Combined the two working copies
Combined the two working copies