Merge branch 'master', remote branch 'origin'
update brent with popup
Merge pull request #30 from bkingery/master

update brent with a popup
Merge remote branch 'upstream/master'
testing. mantra hates me