Merge pull request #1 from gkerickson/master

Galen is the best
Elena is the Best
adding file
Fixing problems
Merge branch 'gkerickson-master'
Merge pull request #2 from stpaultim/master

Test