Even more clean up
Merge branch 'master' of github.com:KenneyE/App-Academy