Add sign out and Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	files/header.php
	styles/style.css