blaaah
First app from book
Merge branch 'master' of github.com:yadrimz/something