merging in Nate's code
Merge branch 'master' of github.com:chuckrea/giftr
file 1234