continued registration
Merge branch 'master' of github.com:pairide/pairide

Conflicts:
	public/stylesheets/style.css