Merge branch 'master' of /Users/betty/WebstormProjects/Template/FamousBoilerPlate with conflicts.
Merge remote-tracking branch 'origin/master'
CreditBox