Merge pull request #15 from brack/master

more fixes
update
Merge branch 'master' of github.com:nick49rt/codefest-jetsons
buf fix
removed bad file
app icon and add time dialog changes
Merge pull request #16 from abhijitnukalapati/master

Changing app icon
merging from upstream