update shift
Merge branch 'master' of https://github.com/drupalfellows/good_fellas
change make file