updated gem
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
updated gem
updated gem
Merge remote-tracking branch 'origin/master'
fixed footer padding and bad link