update for #4
change number #5
Merge branch 'master' of github.com:Porsesh/QandA

Conflicts:
	Server/public/client/app/index.html