minor git branching test
added config/initializers/assets.rb
minor git branching test
minor
minor
Merge branch 'rails4.1.4'

Conflicts:
	config/initializers/assets.rb
set up unicorn-rails as the production server
minor