gemfire ps
Merge branch 'master' of github.com:Ukiebook/ukiebook

Conflicts:
	Gemfile