Merge pull request #1 from wdistring2014/master

app.js bios complete
Merge pull request #2 from mrwilsondj/master

Merge pull request #1 from wdistring2014/master