added halifax
Merge branch 'master' of https://github.com/hombredestutz/git-mania