Merge pull request #1 from PdxCodeGuild/master

Merge pull request #1 from KBratland/master
December 10th, 2014
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from KBratland/master

Dec. 10th, 2014