Everything committed
Merge branch 'master' of https://github.com/rrzein/appacademy
Merging app academy files