added link for generator-mixtape
Merge branch 'master' of https://github.com/mrkelly/up-angular