merge apps and lines and timer
Merge pull request #4 from weolopez/addApps

merge apps and lines and timer