Minor changes for labs
add angular stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot.js
	package.json