feature2 change
master change
Merge branch 'feature2'

Conflicts:
	app.js
feature1 change fix
master change fix
Merge branch 'feature1'

Conflicts:
	app.js
added join game and password
Merge branch 'feature1'