Social icons fixed
Social icons fixed
Merge origin/master

Conflicts:
	styles/main.css