Questions up and ready
JACS code and final sorting.
Seeds stuff
Created views
Elo class
Elo stuff working, user accounts added
Moved to root
Postgres for production (heroku)
Merge branch 'master' of https://github.com/jubjubbird01/unilo

God knows if this works, I screwed up. Sorry guys.

# By emzie154 (15) and Mayank (14)
# Via emzie154 (7) and Mayank (4)
* 'master' of https://github.com/jubjubbird01/unilo: (29 commits)
  meh2
  Master BG inclusion
  meh
  Add background image
  TO MASTER
  broken
  message
  HTML template working wheee
  schema.rb
  pls work
  Deletion of assets/stylesheets/application.css
  Commit to master.
  updated sass/haml
  Cleared Merge Conflict Trail
  please work
  bootstrap again
  Added haml for the 9000th time
  Minor changes
  FE Changes
  test
  ...

Conflicts:
	unilo/Gemfile
	unilo/Gemfile.lock
	unilo/app/views/layouts/application.html.haml
	unilo/config/routes.rb
Fixes some merge issues.
Further fixes
Seeds and stuff ready for heroku.
Merge branch 'nd-elo' into heroku

* nd-elo:
  Seeds and stuff ready for heroku.

Conflicts:
	db/development.sqlite3
FIX
MAYBE THIS WILL FIX IT, I DON'T KNOW
Fixed issue
Merge merge merge
Merge branch 'heroku'

* heroku:
  Fixed issue
  MAYBE THIS WILL FIX IT, I DON'T KNOW
  FIX
  Seeds and stuff ready for heroku.
  Postgres for production (heroku)
  Moved to root

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.haml
	db/development.sqlite3
	db/seeds.rb
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid
	unilo/app/assets/stylesheets/application.css
Seeds