Merge server and rails_3_1

app/views/sites/index.html.erb

@@ -1 +1,7 @@
-<%= @title %>
+<% if @site && @site.registered? %>
+	registered
+<% else %>
+	<%= link_to 'register', 'http://localhost:3001/user/sites/register?' + 
+			{:site => {:school => @site.school, :department => @site.department}}.to_query,
+			:target => '_blank' %>
+<% end %>