changed user greeting location
Merge branch 'master' of https://github.com/msyinmei/SketchPhraseV1

Conflicts:
	app/views/games/index.html.erb
Merge pull request #56 from catlag/master

Changed greeting location