081114 1502
Merge branch 'master' of github.com:joelhughes06/Path21

Conflicts:
	Gemfile
	Gemfile.lock