Skeleton tests related to adding skills.
Implement basic Skill methods.
Pull logic around adding a training path into a method.
Commit before upstream pull.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/skill.rb
	lib/environment.rb