add google search
change readme, refactoring aditional classes
change readme, refactoring aditional classes
Merge pull request #11 from SlaffM/feature

change readme, refactoring aditional classes
change readme, refactoring aditional classes
Merge remote-tracking branch 'origin/dev' into dev
add scss, design refactoring
add scss, design refactoring
add scss, design refactoring
add scss
scss refactoring
Merge pull request #12 from SlaffM/feature

Feature
scss and model refactoring
Merge remote-tracking branch 'origin/dev' into dev
add static_pages controller
Merge branch 'feature' into dev
Merge branch 'dev'

Conflicts:
	Gemfile
	app/controllers/shedules_controller.rb
	app/controllers/welcome_controller.rb
	app/models/shedule.rb
	app/models/user.rb
	app/views/devise/registrations/new.html.erb
	app/views/layouts/application.html.erb
	app/views/shedules/_form.html.erb
	app/views/welcome/index.html.erb
	config/application.rb
	config/routes.rb
	lib/images/image_class.rb