Initial commit
Finish layouts and routes
Merge branch 'master' of https://github.com/phppirate/sample_app

Conflicts:
	.rspec
	Gemfile
	Gemfile.lock
	README.md
	Rakefile
	app/assets/images/rails.png
	app/assets/javascripts/application.js
	app/assets/javascripts/static_pages.js.coffee
	app/assets/javascripts/users.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/static_pages.css.scss
	app/assets/stylesheets/users.css.scss
	app/controllers/application_controller.rb
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/static_pages_helper.rb
	app/helpers/users_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_shim.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/about.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/new.html.erb
	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/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/OLD_index.html
	public/favicon.ico
	public/index.html
	public/robots.txt
	spec/controllers/users_controller_spec.rb
	spec/helpers/users_helper_spec.rb
	spec/requests/static_pages_spec.rb
	spec/requests/user_pages_spec.rb
	spec/spec_helper.rb
	spec/support/utilities.rb
	spec/views/users/new.html.erb_spec.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep