Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

1 files changed, 6 insertions, 0 deletions

diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb
new file mode 100644
index 0000000..a92cdb5
--- /dev/null
+++ b/app/views/servers/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing server</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @server %> |
+<%= link_to 'Back', servers_path %>