updates
Merge branch 'master' of github.com:MyFriendBrad/myfriendbrad.github.com