Small Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	template/aside.html
	template/header.html