update assets
version up
declare depency
update assets
contributing.md
update assets
refactor
version up
update assets
update assets
Added to_s when comparing Rails::Version
Merge pull request #53 from cedel/master

Stringify Rails.version when comparing with string
update to ruby 2
reordering
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails
update readme
formatting
update assets
update ruby
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	.rvmrc