Social links and footer content
Merge branch 'master' of github.com:djmosc/nazaninrosematin
A few things
Merge branch 'master' of github.com:djmosc/nazaninrosematin

Conflicts:
	css/style.css
	footer.php