href added
column-right change
Merge remote-tracking branch 'origin/master'

Conflicts:
	style/profile.css
connect to login