Cleaned up views, added friending
Merge branch 'master' of github.com:bfosberry/GameSocial

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:bfosberry/GameSocial