Updated framework
Merge branch 'master' of github.com:danmichaelo/42