Inga borders
Merge branch 'master' of github.com:rhymn/rhymn.github.io

Conflicts:
	css/style.css