a
Merge branch 'master' of github.com:gleant/fbcremix

Conflicts:
	.gitignore
	.idea/.generators
	.idea/.rakeTasks
	.idea/fbcremix.iml
	.idea/misc.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	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/inflections.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
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt