commit to merge
Merge branch 'master' of https://github.com/ChrisBinge/FLSBlog

Conflicts:
	style.css
add styles..
frontpage and article css adjusted, author css merged