Initial commit
a template mobile web site!
a first version
Update database.yml
guanMac

first
guanMac

second
a new frame...
2 version
a base frame
2 version
second version
third version

50%
a

a
b

b
guanmac

GUANmac
Merge branch 'master' of https://github.com/zxz115/rail88
big demo

big demo
guanmac

pull
mark

mark
Merge branch 'mark'

Conflicts:
	app/controllers/admin/columns_controller.rb
	app/controllers/admin/customers_controller.rb
	app/helpers/admin_helper.rb
	app/models/logo.rb
	app/models/user.rb
	app/views/admin/columns/_form.html.erb
	app/views/admin/customers/edit.html.erb
	app/views/layouts/admin.html.erb
	app/views/logos/index.html.erb
	app/views/my_registrations/edit.html.erb
	config/routes.rb