Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

1 files changed, 0 insertions, 1 deletions

diff --git a/start.sh b/start.sh
index 6c0d594..cb9cdda 100755
--- a/start.sh
+++ b/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-generate.sh
 nohup bundle exec rails server &