initial commit
Merge branch 'master' of https://github.com/asteel1981/flash_app_1.1

Github needed this for the intial commit push.