Initial commit
init www load
mergin
spelling fixes
added google analytics code to main page
sync
update
phase 1 merger
Merge github.com:masterbeef/www

Conflicts:
	.gitignore
	.project
	Gemfile
	Gemfile.lock
	README.md
	README.rdoc
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/inflections.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	config/unicorn.rb
	config/unicorn_init.sh
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	test/test_helper.rb
merger