Merge branch 'test-sjaan' into test-rick
Merge sjaan
Homepage added, register styling.
Merge branch 'test-rick'

Conflicts:
	bross/static/css/style.css
	bross/templates/register.html
	bross/urls.py
Merge remote-tracking branch 'origin/master' into test-sjaan