synchronization between two projects
Merge branch 'prod' of https://github.com/helenasilkina/team-3

Conflicts:
	gulpfile.js
	public/index.html
	public/js/app/app.js
	server/swarm_server.js