First step
Merge branch 'master' of https://github.com/larousso/angular-marvel