Initial commit
Merge branch 'master' of github.com:munjam/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	app/assets/stylesheets/application.css
	config/application.rb
	config/environments/production.rb
	config/initializers/secret_token.rb