Rails 4.1.4
Merge pull request #30 from iceEiji/update_rails

Conflicts:
	Gemfile
	Gemfile.lock