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
push tags
update ruby
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	.rvmrc
push tags too
Update testapp to rails 4
update
Add a note for turbolinks
add endorse button
refactor
new release
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	Rakefile