initial commit
Merge branch 'master' of github.com:catfriend/cf_week_three