init
herna
First start
Merge branch 'master' of heroku.com:univote

Conflicts:
	.gitignore
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/univote.iml
	.idea/vcs.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/images/avatar.png
	app/assets/images/avatars/imi.png
	app/assets/images/avatars/imi_mgpu.png
	app/assets/images/favicon.ico
	app/assets/images/logo.png
	app/assets/images/rails.png
	app/assets/images/symbols/imi.png
	app/assets/images/symbols/imi_mgpu.png
	app/assets/javascripts/application.js
	app/assets/javascripts/universities.js.coffee
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/universities.css.scss
	app/controllers/application_controller.rb
	app/controllers/universities_controller.rb
	app/helpers/application_helper.rb
	app/helpers/universities_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/models/university.rb
	app/models/university2.rb
	app/views/layouts/application.html.haml
	app/views/universities/_form.html.erb
	app/views/universities/_load.html.haml
	app/views/universities/edit.html.erb
	app/views/universities/index.html.haml
	app/views/universities/index1.html.erb
	app/views/universities/new.html.erb
	app/views/universities/show.html.erb
	app/views/universities/showbyid.html.haml
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20130210184157_create_universities.rb
	db/schema.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	lib/translit.rb
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/index2.html
	public/robots.txt
	script/rails
	test/fixtures/.gitkeep
	test/fixtures/universities.yml
	test/functional/.gitkeep
	test/functional/universities_controller_test.rb
	test/integration/.gitkeep
	test/performance/browsing_test.rb
	test/test_helper.rb
	test/unit/.gitkeep
	test/unit/helpers/universities_helper_test.rb
	test/unit/university_test.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep
test new
only ENg
only ENg
only ENg
only ENg
only ENg
with oauth
with oauth2
with oauth3
with oauth3
with oauth3
with oauth3
with oauth3
with oauth3
with oauth3
with oauth3