Learning how to commit
Merge branch 'master' of github.com:wickedroar/lonely_squirrel