init
init
m
m
Fix
Fix
Fix
Merge branch 'rominbranch'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
	app/views/main/index.html.erb
	config/database.yml
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb