updating gem
updated gemfile list
Merge branch 'master' of github.com:irissilvermoon/Taskio

Conflicts:
	Gemfile
	Gemfile.lock