added /bower_components to server.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Client.html