updates
Merge branch 'master' of https://github.com/berma/berma.github.io

Conflicts:
	style.css
j