Edrick Update
Merge branch 'master' of https://github.com/dzap/front-end-dev-test