Version dot1.1
Merge branch 'master' of https://github.com/2vcps/vdi-calc

Conflicts:
	manifest.yml
	vdi-calc.rb
	views/calc_home.erb
	views/index.erb