ng-boilerplate update, now works, watch out for issue n1 @1
Merge branch 'socketio' of github.com:mrgamer/musicpad into socketio

Conflicts:
	client/Makefile
added socket.io-client, i need to make it work now :)