Michael Update
Merge branch 'master' of https://github.com/apple777/hackita-thursdays