profile
Merge branch 'master' of https://github.com/max-konin/Kogdata
a part of view of profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb