fixed rules page, log in, and register
small change to rules page
Merge branch 'master' into bootstrap_fixes

Conflicts:
	app/views/rules/new.html.erb