initial rails app version 3.2.13
Merge branch 'master' of https://github.com/abeyum/revoltdc

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb