initial commit, basic setup
basinal tagging and friendly urls
Merge branch 'master' of github.com:mttdffy/rails-test-setup into updated_sample_app

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Guardfile
	README.md
	README.rdoc
	Rakefile
	app/assets/images/rails.png
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/application_controller.rb
	app/controllers/articles_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/articles_helper.rb
	app/helpers/sessions_helper.rb
	app/helpers/users_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/models/article.rb
	app/models/permission.rb
	app/models/user.rb
	app/views/articles/_form.html.haml
	app/views/articles/edit.html.haml
	app/views/articles/index.html.haml
	app/views/articles/new.html.haml
	app/views/articles/show.html.haml
	app/views/sessions/new.html.haml
	app/views/users/edit.html.haml
	app/views/users/new.html.haml
	app/views/users/show.html.haml
	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/strong_parameters.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20121018135513_create_articles.rb
	db/migrate/20121018140313_create_users.rb
	db/migrate/20121018142735_add_username_to_user.rb
	db/migrate/20121018150158_rename_password_salt_column_on_user.rb
	db/migrate/20121018154110_remove_password_columns_from_user.rb
	db/migrate/20121019181248_add_admin_to_user.rb
	db/schema.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/favicon.ico
	public/robots.txt
	spec/factories.rb
	spec/models/article_spec.rb
	spec/models/permission_spec.rb
	spec/models/user_spec.rb
	spec/requests/articles_spec.rb
	spec/requests/sessions_spec.rb
	spec/requests/users_spec.rb
	spec/routing/articles_routing_spec.rb
	spec/spec_helper.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep
Merge pull request #1 from mttdffy/updated_sample_app

Updating some of this stuff, adding more common basic functionality