added some new stuff
Merge branch 'master' of https://github.com/kmiller68/Flash-Me