Initialize repository
init aasm
aasm first step
init
init
finish aasm
finish aasm
init
init
init
init
init
Full finish
Merge branch 'master' of https://github.com/cybernick/my_project

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin/users_controller.rb
	app/controllers/hotels_controller.rb
	app/controllers/pages_controller.rb
	app/helpers/hotels_helper.rb
	app/models/hotel.rb
	app/views/hotels/show.html.haml
	db/schema.rb