simple changes
Merge branch 'master' of github.com:gduplessy/Taskr

Conflicts:
	Gemfile.lock