updated for pull request
user stories
Gems
Rename files
Merge branch 'master' of git://github.com/nickfausnight/internship-program into nickfausnight-master

Conflicts:
	til/06-07-13