Changed profile tab css
Anothe pushi
Fixed css conflict.

Merge branch 'more' of https://github.com/JulesWiz/project3 into JulesWiz-more

Conflicts:
	app/assets/stylesheets/application.css