added some angular stuff
added some angular and socketio stuff
Merge branch 'master' of github.com:beachygreg/zapoc

Conflicts:
	main.js
	public/index.html