adding gulp V grunt
Merge branch 'gh-pages' of https://github.com/chrismatheson/mancjs-angular-talk into gh-pages

Conflicts:
	index.html