Added initial form
Added initial form
I suck at styling
Merge branch 'registration_form' of github.com:railsgirlslondon/railsgirls-london into registration_form

* 'registration_form' of github.com:railsgirlslondon/railsgirls-london:
  Added initial form

Conflicts:
	app/controllers/registrations_controller.rb
	app/views/registrations/new.html.haml
Merge branch 'master' into registration_form

* master:
  add twitter to city

Conflicts:
	db/schema.rb
Merge pull request #51 from railsgirlslondon/registration_form

Registration form