merging
Merge branch 'master' of https://github.com/kaseyle/daydream
still working on alarm
Merge branch 'master' of https://github.com/kaseyle/daydream
draw on iphone